diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-07-21 00:10:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-07-21 00:10:54 +0000 |
| commit | d04a7cf92af4548bb259e3f3c871b06aca392b7a (patch) | |
| tree | 9d8d8c265c64b6520488b4bbb5d93bcbc8090106 /openstackclient/tests/functional/compute | |
| parent | 57e7d9fdb33c17a96460655e46ff93bc9d19f807 (diff) | |
| parent | f1d32dbe9b6f5f2e47853b9969483fa841e451f4 (diff) | |
| download | python-openstackclient-d04a7cf92af4548bb259e3f3c871b06aca392b7a.tar.gz | |
Merge "Clean up the changes of os.environ in functional tests"
Diffstat (limited to 'openstackclient/tests/functional/compute')
| -rw-r--r-- | openstackclient/tests/functional/compute/v2/test_flavor.py | 8 | ||||
| -rw-r--r-- | openstackclient/tests/functional/compute/v2/test_server.py | 1 |
2 files changed, 7 insertions, 2 deletions
diff --git a/openstackclient/tests/functional/compute/v2/test_flavor.py b/openstackclient/tests/functional/compute/v2/test_flavor.py index 0b01da51..eefd3fab 100644 --- a/openstackclient/tests/functional/compute/v2/test_flavor.py +++ b/openstackclient/tests/functional/compute/v2/test_flavor.py @@ -23,6 +23,7 @@ class FlavorTests(base.TestCase): @classmethod def setUpClass(cls): + super(FlavorTests, cls).setUpClass() # Make a project cmd_output = json.loads(cls.openstack( "project create -f json --enable " + cls.PROJECT_NAME @@ -31,8 +32,11 @@ class FlavorTests(base.TestCase): @classmethod def tearDownClass(cls): - raw_output = cls.openstack("project delete " + cls.PROJECT_NAME) - cls.assertOutput('', raw_output) + try: + raw_output = cls.openstack("project delete " + cls.PROJECT_NAME) + cls.assertOutput('', raw_output) + finally: + super(FlavorTests, cls).tearDownClass() def test_flavor_delete(self): """Test create w/project, delete multiple""" diff --git a/openstackclient/tests/functional/compute/v2/test_server.py b/openstackclient/tests/functional/compute/v2/test_server.py index c9f4d62c..b7a25996 100644 --- a/openstackclient/tests/functional/compute/v2/test_server.py +++ b/openstackclient/tests/functional/compute/v2/test_server.py @@ -25,6 +25,7 @@ class ServerTests(common.ComputeTestCase): @classmethod def setUpClass(cls): + super(ServerTests, cls).setUpClass() cls.haz_network = base.is_service_enabled('network') def test_server_list(self): |