From b8283527be469b04bb1700444894d636bfb84228 Mon Sep 17 00:00:00 2001 From: qinchunhua Date: Mon, 11 Jul 2016 02:16:43 -0400 Subject: [PATCH] Correct reraising of exception When an exception was caught and rethrown, it should call 'raise' without any arguments because it shows the place where an exception occured initially instead of place where the exception re-raised. Change-Id: Ib9d568d1d2915d5f183c076a114312c7bd9d5dfc --- astara/test/functional/base.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) mode change 100644 => 100755 astara/test/functional/base.py diff --git a/astara/test/functional/base.py b/astara/test/functional/base.py old mode 100644 new mode 100755 index 13bb7ca6..fac1e9d0 --- a/astara/test/functional/base.py +++ b/astara/test/functional/base.py @@ -445,7 +445,7 @@ class TestTenant(object): if e.status_code == 404: router_ids.remove(rid) else: - raise e + raise self._wait_for_neutron_delete('router', router_ids) time.sleep(2) @@ -461,7 +461,7 @@ class TestTenant(object): if e.status_code == 404: port_ids.remove(pid) else: - raise e + raise self._wait_for_neutron_delete('port', port_ids) subnet_ids = [ @@ -475,7 +475,7 @@ class TestTenant(object): if e.status_code == 404: subnet_ids.remove(sid) else: - raise e + raise self._wait_for_neutron_delete('subnet', subnet_ids) # need to make sure the vrrp and mgt ports get deleted @@ -487,7 +487,7 @@ class TestTenant(object): if e.status_code == 404: astara_router_ports.remove(p) else: - raise e + raise self._wait_for_neutron_delete('port', astara_router_ports) networks = self.clients.neutronclient.list_networks().get('networks') @@ -501,7 +501,7 @@ class TestTenant(object): if e.status_code == 404: net_ids.remove(nid) else: - raise e + raise self._wait_for_neutron_delete('network', net_ids)