commit 89f4b5fb614e586a266268a90f078a581bd4d57b
author Jenkins <jenkins@review.openstack.org> Fri Sep 05 22:43:53 2014 +0000
committer Gerrit Code Review <review@openstack.org> Fri Sep 05 22:43:53 2014 +0000
tree e860170b01e8298fe672a48d9a454e972ad2f858
parent b1741df3cf2a8eaf72633214905a8b2ba5bd22a0
parent cd879c5287f4c260b1ec29e593dcad3efcfe5af7

Merge "Verify network connectivity before state check"

tempest/scenario/test_network_advanced_server_ops.py

diff --git a/tempest/scenario/test_network_advanced_server_ops.py b/tempest/scenario/test_network_advanced_server_ops.py
index aa04752..47f2f1a 100644
--- a/tempest/scenario/test_network_advanced_server_ops.py
+++ b/tempest/scenario/test_network_advanced_server_ops.py
@@ -70,6 +70,9 @@
                                          create_kwargs=create_kwargs)
         self.floating_ip = self._create_floating_ip(self.server,
                                                     public_network_id)
+        # Verify that we can indeed connect to the server before we mess with
+        # it's state
+        self._wait_server_status_and_check_network_connectivity()
 
     def _check_network_connectivity(self, should_connect=True):
         username = CONF.compute.image_ssh_user