commit 640629f6ab9cbab64003353c7ba0cd5de238c6df
author Jenkins <jenkins@review.openstack.org> Fri Jan 24 09:03:10 2014 +0000
committer Gerrit Code Review <review@openstack.org> Fri Jan 24 09:03:10 2014 +0000
tree 43d715886f4b1f89d4722590685baf6814d7cfe8
parent 25eef9a02ef24cb939638888288da0e5d2a831b5
parent 5462b33673ea23eb9db16d44035d46d29fa455bb

Merge "Catch ssh exception and detach in min scenario"

tempest/scenario/test_minimum_basic.py

diff --git a/tempest/scenario/test_minimum_basic.py b/tempest/scenario/test_minimum_basic.py
index c2c5e27..26a4dc0 100644
--- a/tempest/scenario/test_minimum_basic.py
+++ b/tempest/scenario/test_minimum_basic.py
@@ -159,6 +159,7 @@
         self.cinder_list()
         self.cinder_show()
         self.nova_volume_attach()
+        self.addCleanup(self.nova_volume_detach)
         self.cinder_show()
         self.nova_reboot()
 
@@ -167,5 +168,3 @@
         self._create_loginable_secgroup_rule_nova()
         self.ssh_to_server()
         self.check_partitions()
-
-        self.nova_volume_detach()