Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B40FBC16B for ; Sat, 6 Jul 2013 13:51:20 +0000 (UTC) Received: (qmail 75954 invoked by uid 500); 6 Jul 2013 13:51:20 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 75915 invoked by uid 500); 6 Jul 2013 13:51:20 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 75908 invoked by uid 99); 6 Jul 2013 13:51:19 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 06 Jul 2013 13:51:19 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E866982CB37; Sat, 6 Jul 2013 13:51:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tsp@apache.org To: commits@cloudstack.apache.org Message-Id: <24536c348a3d49f395fd77484838f09f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master-6-17-stable to 5970b39 Date: Sat, 6 Jul 2013 13:51:18 +0000 (UTC) Updated Branches: refs/heads/master-6-17-stable 8b9c15731 -> 5970b3927 do not wait for cleanup simply cleanup and exit and network.gc will happen later Signed-off-by: Prasanna Santhanam (cherry picked from commit 620ed6e0f177bf32aa8d966cade07b93c7045dc9) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5970b392 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5970b392 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5970b392 Branch: refs/heads/master-6-17-stable Commit: 5970b3927dbd4ff6761815788a129df08bdfa84b Parents: 8b9c157 Author: Prasanna Santhanam Authored: Sat Jul 6 19:19:02 2013 +0530 Committer: Prasanna Santhanam Committed: Sat Jul 6 19:21:08 2013 +0530 ---------------------------------------------------------------------- test/integration/component/test_vpc_network_lbrules.py | 5 ----- test/integration/component/test_vpc_network_pfrules.py | 1 - test/integration/component/test_vpc_network_staticnatrule.py | 4 ---- 3 files changed, 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5970b392/test/integration/component/test_vpc_network_lbrules.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_vpc_network_lbrules.py b/test/integration/component/test_vpc_network_lbrules.py index 865cf0e..a1dd19b 100644 --- a/test/integration/component/test_vpc_network_lbrules.py +++ b/test/integration/component/test_vpc_network_lbrules.py @@ -41,7 +41,6 @@ from marvin.integration.lib.common import (get_domain, get_zone, get_template, cleanup_resources, - wait_for_cleanup, list_routers) class Services: @@ -249,10 +248,6 @@ class TestVPCNetworkLBRules(cloudstackTestCase): try: #Clean up, terminate the created network offerings cleanup_resources(self.apiclient, self._cleanup) - wait_for_cleanup(self.apiclient, [ - "network.gc.interval", - "network.gc.wait"]) - except Exception as e: self.debug("Warning: Exception during cleanup : %s" % e) #raise Exception("Warning: Exception during cleanup : %s" % e) http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5970b392/test/integration/component/test_vpc_network_pfrules.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_vpc_network_pfrules.py b/test/integration/component/test_vpc_network_pfrules.py index ad7bbae..64a6aa2 100644 --- a/test/integration/component/test_vpc_network_pfrules.py +++ b/test/integration/component/test_vpc_network_pfrules.py @@ -37,7 +37,6 @@ from marvin.integration.lib.common import (get_domain, get_zone, get_template, cleanup_resources, - wait_for_cleanup, list_routers) http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5970b392/test/integration/component/test_vpc_network_staticnatrule.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_vpc_network_staticnatrule.py b/test/integration/component/test_vpc_network_staticnatrule.py index 1410f5e..c064053 100644 --- a/test/integration/component/test_vpc_network_staticnatrule.py +++ b/test/integration/component/test_vpc_network_staticnatrule.py @@ -37,7 +37,6 @@ from marvin.integration.lib.common import (get_domain, get_zone, get_template, cleanup_resources, - wait_for_cleanup, list_routers) @@ -248,9 +247,6 @@ class TestVPCNetworkPFRules(cloudstackTestCase): try: #Clean up, terminate the created network offerings cleanup_resources(self.apiclient, self._cleanup) - wait_for_cleanup(self.apiclient, [ - "network.gc.interval", - "network.gc.wait"]) except Exception as e: self.debug("Warning: Exception during cleanup : %s" % e) #raise Exception("Warning: Exception during cleanup : %s" % e)