summaryrefslogtreecommitdiff
path: root/openstackclient/tests/functional/object
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-21 00:10:54 +0000
committerGerrit Code Review <review@openstack.org>2017-07-21 00:10:54 +0000
commitd04a7cf92af4548bb259e3f3c871b06aca392b7a (patch)
tree9d8d8c265c64b6520488b4bbb5d93bcbc8090106 /openstackclient/tests/functional/object
parent57e7d9fdb33c17a96460655e46ff93bc9d19f807 (diff)
parentf1d32dbe9b6f5f2e47853b9969483fa841e451f4 (diff)
downloadpython-openstackclient-d04a7cf92af4548bb259e3f3c871b06aca392b7a.tar.gz
Merge "Clean up the changes of os.environ in functional tests"
Diffstat (limited to 'openstackclient/tests/functional/object')
-rw-r--r--openstackclient/tests/functional/object/v1/test_container.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/openstackclient/tests/functional/object/v1/test_container.py b/openstackclient/tests/functional/object/v1/test_container.py
index af76efd9..acfbab11 100644
--- a/openstackclient/tests/functional/object/v1/test_container.py
+++ b/openstackclient/tests/functional/object/v1/test_container.py
@@ -21,14 +21,18 @@ class ContainerTests(base.TestCase):
@classmethod
def setUpClass(cls):
+ super(ContainerTests, cls).setUpClass()
opts = cls.get_opts(['container'])
raw_output = cls.openstack('container create ' + cls.NAME + opts)
cls.assertOutput(cls.NAME + '\n', raw_output)
@classmethod
def tearDownClass(cls):
- raw_output = cls.openstack('container delete ' + cls.NAME)
- cls.assertOutput('', raw_output)
+ try:
+ raw_output = cls.openstack('container delete ' + cls.NAME)
+ cls.assertOutput('', raw_output)
+ finally:
+ super(ContainerTests, cls).tearDownClass()
def test_container_list(self):
opts = self.get_opts(['Name'])