commit bca602a88ddb60162387040f66c746568c289cca
author Jenkins <jenkins@review.openstack.org> Tue Feb 18 12:59:40 2014 +0000
committer Gerrit Code Review <review@openstack.org> Tue Feb 18 12:59:40 2014 +0000
tree 9035ebdb6b210f84904b82539266580a386873c1
parent 5e678848ca0bbde6e4842510ff2247c566bce47c
parent 28c2520dc935ecf0c61b8b65f89d4455b0bbb633

Merge "Let the soft reboot really happen in the minimum scenario"

tempest/scenario/test_minimum_basic.py

diff --git a/tempest/scenario/test_minimum_basic.py b/tempest/scenario/test_minimum_basic.py
index 846e0cc..e868075 100644
--- a/tempest/scenario/test_minimum_basic.py
+++ b/tempest/scenario/test_minimum_basic.py
@@ -130,6 +130,7 @@
     def ssh_to_server(self):
         try:
             self.linux_client = self.get_remote_client(self.floating_ip.ip)
+            self.linux_client.validate_authentication()
         except Exception:
             LOG.exception('ssh to server failed')
             self._log_console_output()
@@ -160,10 +161,11 @@
         self.nova_volume_attach()
         self.addCleanup(self.nova_volume_detach)
         self.cinder_show()
-        self.nova_reboot()
 
         self.nova_floating_ip_create()
         self.nova_floating_ip_add()
         self._create_loginable_secgroup_rule_nova()
         self.ssh_to_server()
+        self.nova_reboot()
+        self.ssh_to_server()
         self.check_partitions()