Merge "Clean up the changes of os.environ in functional tests"

14 files changed, 72 insertions, 71 deletions

diff --git a/openstackclient/tests/functional/volume/v1/common.py b/openstackclient/tests/functional/volume/v1/common.py
index f9d96bbb..4978cea3 100644
--- a/openstackclient/tests/functional/volume/v1/common.py
+++ b/openstackclient/tests/functional/volume/v1/common.py
@@ -10,7 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import os
+import fixtures
 
 from openstackclient.tests.functional.volume import base
 
@@ -18,6 +18,9 @@ from openstackclient.tests.functional.volume import base
 class BaseVolumeTests(base.BaseVolumeTests):
     """Base class for Volume functional tests. """
 
-    @classmethod
-    def setUpClass(cls):
-        os.environ['OS_VOLUME_API_VERSION'] = '1'
+    def setUp(self):
+        super(BaseVolumeTests, self).setUp()
+        ver_fixture = fixtures.EnvironmentVariable(
+            'OS_VOLUME_API_VERSION', '1'
+        )
+        self.useFixture(ver_fixture)
diff --git a/openstackclient/tests/functional/volume/v1/test_snapshot.py b/openstackclient/tests/functional/volume/v1/test_snapshot.py
index 28726762..c60472c5 100644
--- a/openstackclient/tests/functional/volume/v1/test_snapshot.py
+++ b/openstackclient/tests/functional/volume/v1/test_snapshot.py
@@ -35,9 +35,12 @@ class VolumeSnapshotTests(common.BaseVolumeTests):
 
     @classmethod
     def tearDownClass(cls):
-        cls.wait_for_status('volume', cls.VOLLY, 'available')
-        raw_output = cls.openstack('volume delete --force ' + cls.VOLLY)
-        cls.assertOutput('', raw_output)
+        try:
+            cls.wait_for_status('volume', cls.VOLLY, 'available')
+            raw_output = cls.openstack('volume delete --force ' + cls.VOLLY)
+            cls.assertOutput('', raw_output)
+        finally:
+            super(VolumeSnapshotTests, cls).tearDownClass()
 
     def test_volume_snapshot__delete(self):
         """Test create, delete multiple"""
diff --git a/openstackclient/tests/functional/volume/v1/test_transfer_request.py b/openstackclient/tests/functional/volume/v1/test_transfer_request.py
index bd612829..73191fc9 100644
--- a/openstackclient/tests/functional/volume/v1/test_transfer_request.py
+++ b/openstackclient/tests/functional/volume/v1/test_transfer_request.py
@@ -37,12 +37,15 @@ class TransferRequestTests(common.BaseVolumeTests):
 
     @classmethod
     def tearDownClass(cls):
-        raw_output_transfer = cls.openstack(
-            'volume transfer request delete ' + cls.NAME)
-        raw_output_volume = cls.openstack(
-            'volume delete ' + cls.VOLUME_NAME)
-        cls.assertOutput('', raw_output_transfer)
-        cls.assertOutput('', raw_output_volume)
+        try:
+            raw_output_transfer = cls.openstack(
+                'volume transfer request delete ' + cls.NAME)
+            raw_output_volume = cls.openstack(
+                'volume delete ' + cls.VOLUME_NAME)
+            cls.assertOutput('', raw_output_transfer)
+            cls.assertOutput('', raw_output_volume)
+        finally:
+            super(TransferRequestTests, cls).tearDownClass()
 
     def test_volume_transfer_request_accept(self):
         volume_name = uuid.uuid4().hex
diff --git a/openstackclient/tests/functional/volume/v1/test_volume_type.py b/openstackclient/tests/functional/volume/v1/test_volume_type.py
index acad34ad..74e14070 100644
--- a/openstackclient/tests/functional/volume/v1/test_volume_type.py
+++ b/openstackclient/tests/functional/volume/v1/test_volume_type.py
@@ -31,8 +31,11 @@ class VolumeTypeTests(common.BaseVolumeTests):
 
     @classmethod
     def tearDownClass(cls):
-        raw_output = cls.openstack('volume type delete ' + cls.NAME)
-        cls.assertOutput('', raw_output)
+        try:
+            raw_output = cls.openstack('volume type delete ' + cls.NAME)
+            cls.assertOutput('', raw_output)
+        finally:
+            super(VolumeTypeTests, cls).tearDownClass()
 
     def test_volume_type_list(self):
         cmd_output = json.loads(self.openstack('volume type list -f json'))
diff --git a/openstackclient/tests/functional/volume/v2/common.py b/openstackclient/tests/functional/volume/v2/common.py
index 1d14719f..38176714 100644
--- a/openstackclient/tests/functional/volume/v2/common.py
+++ b/openstackclient/tests/functional/volume/v2/common.py
@@ -10,7 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import os
+import fixtures
 
 from openstackclient.tests.functional.volume import base
 
@@ -18,6 +18,9 @@ from openstackclient.tests.functional.volume import base
 class BaseVolumeTests(base.BaseVolumeTests):
     """Base class for Volume functional tests. """
 
-    @classmethod
-    def setUpClass(cls):
-        os.environ['OS_VOLUME_API_VERSION'] = '2'
+    def setUp(self):
+        super(BaseVolumeTests, self).setUp()
+        ver_fixture = fixtures.EnvironmentVariable(
+            'OS_VOLUME_API_VERSION', '2'
+        )
+        self.useFixture(ver_fixture)
diff --git a/openstackclient/tests/functional/volume/v2/test_snapshot.py b/openstackclient/tests/functional/volume/v2/test_snapshot.py
index 2fff43c8..ba6b2c28 100644
--- a/openstackclient/tests/functional/volume/v2/test_snapshot.py
+++ b/openstackclient/tests/functional/volume/v2/test_snapshot.py
@@ -35,10 +35,13 @@ class VolumeSnapshotTests(common.BaseVolumeTests):
 
     @classmethod
     def tearDownClass(cls):
-        cls.wait_for_status('volume', cls.VOLLY, 'available')
-        raw_output = cls.openstack(
-            'volume delete --force ' + cls.VOLLY)
-        cls.assertOutput('', raw_output)
+        try:
+            cls.wait_for_status('volume', cls.VOLLY, 'available')
+            raw_output = cls.openstack(
+                'volume delete --force ' + cls.VOLLY)
+            cls.assertOutput('', raw_output)
+        finally:
+            super(VolumeSnapshotTests, cls).tearDownClass()
 
     def test_volume_snapshot__delete(self):
         """Test create, delete multiple"""
diff --git a/openstackclient/tests/functional/volume/v2/test_transfer_request.py b/openstackclient/tests/functional/volume/v2/test_transfer_request.py
index e9c2236b..33495af6 100644
--- a/openstackclient/tests/functional/volume/v2/test_transfer_request.py
+++ b/openstackclient/tests/functional/volume/v2/test_transfer_request.py
@@ -38,12 +38,15 @@ class TransferRequestTests(common.BaseVolumeTests):
 
     @classmethod
     def tearDownClass(cls):
-        raw_output_transfer = cls.openstack(
-            'volume transfer request delete ' + cls.NAME)
-        raw_output_volume = cls.openstack(
-            'volume delete ' + cls.VOLUME_NAME)
-        cls.assertOutput('', raw_output_transfer)
-        cls.assertOutput('', raw_output_volume)
+        try:
+            raw_output_transfer = cls.openstack(
+                'volume transfer request delete ' + cls.NAME)
+            raw_output_volume = cls.openstack(
+                'volume delete ' + cls.VOLUME_NAME)
+            cls.assertOutput('', raw_output_transfer)
+            cls.assertOutput('', raw_output_volume)
+        finally:
+            super(TransferRequestTests, cls).tearDownClass()
 
     def test_volume_transfer_request_accept(self):
         volume_name = uuid.uuid4().hex
diff --git a/openstackclient/tests/functional/volume/v2/test_volume_type.py b/openstackclient/tests/functional/volume/v2/test_volume_type.py
index 11acf2f8..99630e6b 100644
--- a/openstackclient/tests/functional/volume/v2/test_volume_type.py
+++ b/openstackclient/tests/functional/volume/v2/test_volume_type.py
@@ -31,8 +31,11 @@ class VolumeTypeTests(common.BaseVolumeTests):
 
     @classmethod
     def tearDownClass(cls):
-        raw_output = cls.openstack('volume type delete ' + cls.NAME)
-        cls.assertOutput('', raw_output)
+        try:
+            raw_output = cls.openstack('volume type delete ' + cls.NAME)
+            cls.assertOutput('', raw_output)
+        finally:
+            super(VolumeTypeTests, cls).tearDownClass()
 
     def test_volume_type_list(self):
         cmd_output = json.loads(self.openstack('volume type list -f json'))
diff --git a/openstackclient/tests/functional/volume/v3/common.py b/openstackclient/tests/functional/volume/v3/common.py
index bc8befa6..a710a683 100644
--- a/openstackclient/tests/functional/volume/v3/common.py
+++ b/openstackclient/tests/functional/volume/v3/common.py
@@ -10,7 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import os
+import fixtures
 
 from openstackclient.tests.functional.volume import base
 
@@ -18,6 +18,9 @@ from openstackclient.tests.functional.volume import base
 class BaseVolumeTests(base.BaseVolumeTests):
     """Base class for Volume functional tests. """
 
-    @classmethod
-    def setUpClass(cls):
-        os.environ['OS_VOLUME_API_VERSION'] = '3'
+    def setUp(self):
+        super(BaseVolumeTests, self).setUp()
+        ver_fixture = fixtures.EnvironmentVariable(
+            'OS_VOLUME_API_VERSION', '3'
+        )
+        self.useFixture(ver_fixture)
diff --git a/openstackclient/tests/functional/volume/v3/test_qos.py b/openstackclient/tests/functional/volume/v3/test_qos.py
index a7af3c5b..a6290fc5 100644
--- a/openstackclient/tests/functional/volume/v3/test_qos.py
+++ b/openstackclient/tests/functional/volume/v3/test_qos.py
@@ -10,15 +10,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import os
-
 from openstackclient.tests.functional.volume.v2 import test_qos as v2
+from openstackclient.tests.functional.volume.v3 import common
 
 
-class QosTests(v2.QosTests):
+class QosTests(common.BaseVolumeTests, v2.QosTests):
     """Functional tests for volume qos. """
-
-    @classmethod
-    def setUpClass(cls):
-        super(QosTests, cls).setUpClass()
-        os.environ['OS_VOLUME_API_VERSION'] = '3'
diff --git a/openstackclient/tests/functional/volume/v3/test_snapshot.py b/openstackclient/tests/functional/volume/v3/test_snapshot.py
index bf05b9de..38e0563a 100644
--- a/openstackclient/tests/functional/volume/v3/test_snapshot.py
+++ b/openstackclient/tests/functional/volume/v3/test_snapshot.py
@@ -11,13 +11,8 @@
 #    under the License.
 
 from openstackclient.tests.functional.volume.v2 import test_snapshot as v2
-import os
+from openstackclient.tests.functional.volume.v3 import common
 
 
-class VolumeSnapshotTests(v2.VolumeSnapshotTests):
+class VolumeSnapshotTests(common.BaseVolumeTests, v2.VolumeSnapshotTests):
     """Functional tests for volume snapshot. """
-
-    @classmethod
-    def setUpClass(cls):
-        super(VolumeSnapshotTests, cls).setUpClass()
-        os.environ['OS_VOLUME_API_VERSION'] = '3'
diff --git a/openstackclient/tests/functional/volume/v3/test_transfer_request.py b/openstackclient/tests/functional/volume/v3/test_transfer_request.py
index 7b54dd20..b3253237 100644
--- a/openstackclient/tests/functional/volume/v3/test_transfer_request.py
+++ b/openstackclient/tests/functional/volume/v3/test_transfer_request.py
@@ -12,13 +12,8 @@
 
 from openstackclient.tests.functional.volume.v2 import test_transfer_request \
     as v2
-import os
+from openstackclient.tests.functional.volume.v3 import common
 
 
-class TransferRequestTests(v2.TransferRequestTests):
+class TransferRequestTests(common.BaseVolumeTests, v2.TransferRequestTests):
     """Functional tests for transfer request. """
-
-    @classmethod
-    def setUpClass(cls):
-        super(TransferRequestTests, cls).setUpClass()
-        os.environ['OS_VOLUME_API_VERSION'] = '3'
diff --git a/openstackclient/tests/functional/volume/v3/test_volume.py b/openstackclient/tests/functional/volume/v3/test_volume.py
index 333826d8..283b830f 100644
--- a/openstackclient/tests/functional/volume/v3/test_volume.py
+++ b/openstackclient/tests/functional/volume/v3/test_volume.py
@@ -11,13 +11,8 @@
 #    under the License.
 
 from openstackclient.tests.functional.volume.v2 import test_volume as v2
-import os
+from openstackclient.tests.functional.volume.v3 import common
 
 
-class VolumeTests(v2.VolumeTests):
+class VolumeTests(common.BaseVolumeTests, v2.VolumeTests):
     """Functional tests for volume. """
-
-    @classmethod
-    def setUpClass(cls):
-        super(VolumeTests, cls).setUpClass()
-        os.environ['OS_VOLUME_API_VERSION'] = '3'
diff --git a/openstackclient/tests/functional/volume/v3/test_volume_type.py b/openstackclient/tests/functional/volume/v3/test_volume_type.py
index f10e64b4..eb66515e 100644
--- a/openstackclient/tests/functional/volume/v3/test_volume_type.py
+++ b/openstackclient/tests/functional/volume/v3/test_volume_type.py
@@ -11,13 +11,8 @@
 #    under the License.
 
 from openstackclient.tests.functional.volume.v2 import test_volume_type as v2
-import os
+from openstackclient.tests.functional.volume.v3 import common
 
 
-class VolumeTypeTests(v2.VolumeTypeTests):
+class VolumeTypeTests(common.BaseVolumeTests, v2.VolumeTypeTests):
     """Functional tests for volume type. """
-
-    @classmethod
-    def setUpClass(cls):
-        super(VolumeTypeTests, cls).setUpClass()
-        os.environ['OS_VOLUME_API_VERSION'] = '3'