commit cbddd45003335cf193333411dd501afae2ed399e
author Jenkins <jenkins@review.openstack.org> Sat Jan 07 00:48:42 2017 +0000
committer Gerrit Code Review <review@openstack.org> Sat Jan 07 00:48:42 2017 +0000
tree 7df26ccc94bf64e7e47955700bfbeac4e1430cdd
parent 3e6cf012b30f55f6b55946a2908d5f1f6aa22aa3
parent f09b6e5cb26d64ce27b28d3b10b73543b9bd135b

Merge "Raise AssertionError instead of eventlet.timeout.Timeout when failing."

neutron/tests/tempest/api/test_routers.py

diff --git a/neutron/tests/tempest/api/test_routers.py b/neutron/tests/tempest/api/test_routers.py
index 20e54cf..d98ea3a 100644
--- a/neutron/tests/tempest/api/test_routers.py
+++ b/neutron/tests/tempest/api/test_routers.py
@@ -163,7 +163,7 @@
         intf = self.create_router_interface(router['id'], subnet['id'])
         status_active = lambda: self.client.show_port(
             intf['port_id'])['port']['status'] == 'ACTIVE'
-        utils.wait_until_true(status_active)
+        utils.wait_until_true(status_active, exception=AssertionError)
 
     @test.idempotent_id('c86ac3a8-50bd-4b00-a6b8-62af84a0765c')
     @test.requires_ext(extension='extraroute', service='network')