| commit | 3226ca1450f53ab7d6c94f2886968bc62ed851b7 | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Wed Aug 13 00:18:47 2014 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Wed Aug 13 00:18:47 2014 +0000 |
| tree | 862f5cbb7e7b966272bc330d3af3280f9bc829b9 | |
| parent | e8e43d050bb4fd7fcfed8863868959ee14d7b373 [diff] | |
| parent | 07c30b2179891447a600c4a20f43cd390b89fac4 [diff] |
Merge "If no volume, don't delete volume in teardown"
diff --git a/tempest/api/compute/v3/servers/test_server_rescue_negative.py b/tempest/api/compute/v3/servers/test_server_rescue_negative.py index 83fe128..6d192a3 100644 --- a/tempest/api/compute/v3/servers/test_server_rescue_negative.py +++ b/tempest/api/compute/v3/servers/test_server_rescue_negative.py
@@ -56,7 +56,8 @@ @classmethod def tearDownClass(cls): - cls.delete_volume(cls.volume['id']) + if hasattr(cls, 'volume'): + cls.delete_volume(cls.volume['id']) super(ServerRescueNegativeV3Test, cls).tearDownClass() def _detach(self, server_id, volume_id):