CLOUDSTACK-4262: Wait twice network.gc for vpcvr shutdown Wait a little bit longer for the VpcVr to shutdown on network shutdown.
Signed-off-by: Prasanna Santhanam <t...@apache.org> (cherry picked from commit 4ed5033a59c7aa5fe95f865c5fcbdba21c03616e) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/042f998d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/042f998d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/042f998d Branch: refs/heads/master Commit: 042f998db4e61d42d0b47d96ad4176e45034de40 Parents: 211f519 Author: Prasanna Santhanam <t...@apache.org> Authored: Wed Aug 14 12:46:07 2013 +0530 Committer: Prasanna Santhanam <t...@apache.org> Committed: Wed Aug 14 15:27:42 2013 +0530 ---------------------------------------------------------------------- test/integration/component/test_vpc_network.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/042f998d/test/integration/component/test_vpc_network.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_vpc_network.py b/test/integration/component/test_vpc_network.py index 4e6c02c..f65e89f 100644 --- a/test/integration/component/test_vpc_network.py +++ b/test/integration/component/test_vpc_network.py @@ -2340,8 +2340,7 @@ class TestVPCNetworkGc(cloudstackTestCase): @attr(tags=["advanced", "intervlan"]) def test_01_wait_network_gc(self): - """ Test stop all the Vms that are part of the a Network - (Wait for network GC).Start 1 Vm from the network. + """ Test network gc after shutdown of vms in the network """ # Validate the following @@ -2358,7 +2357,7 @@ class TestVPCNetworkGc(cloudstackTestCase): self.debug("Waiting for network garbage collection thread to run") # Wait for the network garbage collection thread to run wait_for_cleanup(self.apiclient, - ["network.gc.interval", "network.gc.wait"]) + ["network.gc.interval", "network.gc.wait"]*2) self.debug("Check if the VPC router is in stopped state?") routers = Router.list( self.apiclient, @@ -2376,13 +2375,13 @@ class TestVPCNetworkGc(cloudstackTestCase): self.assertEqual( router.state, "Stopped", - "Router state should be stopped after netwrok.gc.interval" + "Router state should be stopped after network gc" ) return @attr(tags=["advanced", "intervlan"]) def test_02_start_vm_network_gc(self): - """ Test network rules after starting an instance in VPC + """ Test network rules after starting a VpcVr that was shutdown after network.gc """ # Validate the following
