Fix boto initialization
boto test skip(service considered enabled) mechanism based on global
variables, set by the generic_setup_package.
When the tesresources is introduced for handling initialization,
the skip logic frequently sees the default disabled values.
Every boto test cases depends on base class, which static (class)
attribute initialization done, before any setUpClass checking the global
variables.
This initialization is happens only once, and visible by all subclasses.
A possible next step (after this change), to have the
generic_setup_package to return, with a dict contains the conclusion
about the testing and configured variables, it will be visible for all
subclasses.
Change-Id: Idc0a1b1ce0e78f7837c3f3b3a2e0593750861fa7
diff --git a/tempest/testboto.py b/tempest/testboto.py
index 7031fe2..4fb6b02 100644
--- a/tempest/testboto.py
+++ b/tempest/testboto.py
@@ -126,7 +126,7 @@
testresources.ResourcedTestCase):
"""Recommended to use as base class for boto related test."""
- resources = [('boto_init', tempest.tests.boto.BotoResource())]
+ conclusion = tempest.tests.boto.generic_setup_package()
@classmethod
def setUpClass(cls):
diff --git a/tempest/tests/boto/__init__.py b/tempest/tests/boto/__init__.py
index 99dd8a9..6d5149e 100644
--- a/tempest/tests/boto/__init__.py
+++ b/tempest/tests/boto/__init__.py
@@ -26,7 +26,6 @@
import tempest.clients
from tempest.common.utils.file_utils import have_effective_read_access
import tempest.config
-from testresources import TestResourceManager
A_I_IMAGES_READY = False # ari,ami,aki
S3_CAN_CONNECT_ERROR = "Unknown Error"
@@ -97,8 +96,3 @@
else:
S3_CAN_CONNECT_ERROR = None
boto_logger.setLevel(level)
-
-
-class BotoResource(TestResourceManager):
- def make(self, dependency_resources=None):
- return generic_setup_package()