Merge "Fix boto initialization"
diff --git a/tempest/testboto.py b/tempest/testboto.py
index ab79f3c..8bcaa33 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()