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/volume/v2/test_snapshot.py | |
| 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/volume/v2/test_snapshot.py')
| -rw-r--r-- | openstackclient/tests/functional/volume/v2/test_snapshot.py | 11 |
1 files changed, 7 insertions, 4 deletions
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""" |