commit e407c1b61e0a98736a880734a1060eb12f3c4826
author Jenkins <jenkins@review.openstack.org> Mon Jun 01 19:11:12 2015 +0000
committer Gerrit Code Review <review@openstack.org> Mon Jun 01 19:11:12 2015 +0000
tree d51ba41a00fc1908cb4d30b0bb4ae2ddbc6273aa
parent bab9b0c4e02ccb30b4abcf549bcdabb5709791f0
parent ed4c4eb989491884649be748003c0224a59f9391

Merge "Verbose waiting for status in neutron FWaaS"

tempest/api/network/test_fwaas_extensions.py

diff --git a/tempest/api/network/test_fwaas_extensions.py b/tempest/api/network/test_fwaas_extensions.py
index 0622e87..651b4ab 100644
--- a/tempest/api/network/test_fwaas_extensions.py
+++ b/tempest/api/network/test_fwaas_extensions.py
@@ -99,8 +99,13 @@
 
         if not test.call_until_true(_wait, CONF.network.build_timeout,
                                     CONF.network.build_interval):
-            m = ("Timed out waiting for firewall %s to reach %s state(s)" %
-                 (fw_id, target_states))
+            status = self.client.show_firewall(fw_id)['firewall']['status']
+            m = ("Timed out waiting for firewall %s to reach %s state(s) "
+                 "after %ss, currently in %s state." %
+                 (fw_id,
+                  target_states,
+                  CONF.network.build_interval,
+                  status))
             raise exceptions.TimeoutException(m)
 
     @test.idempotent_id('1b84cf01-9c09-4ce7-bc72-b15e39076468')