Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 371F3EEEE for ; Fri, 1 Feb 2013 23:27:44 +0000 (UTC) Received: (qmail 70304 invoked by uid 500); 1 Feb 2013 23:27:34 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 70214 invoked by uid 500); 1 Feb 2013 23:27:34 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 68847 invoked by uid 99); 1 Feb 2013 23:27:32 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Feb 2013 23:27:32 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 06A80829175; Fri, 1 Feb 2013 23:27:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kelveny@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [9/50] [abbrv] git commit: refs/heads/master - test_vm_life_cycle: Fix expunging logic as in mgmt server Message-Id: <20130201232732.06A80829175@tyr.zones.apache.org> Date: Fri, 1 Feb 2013 23:27:32 +0000 (UTC) test_vm_life_cycle: Fix expunging logic as in mgmt server Sets expunge interval to 600 if it's less than that Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/bc40ed85 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/bc40ed85 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/bc40ed85 Branch: refs/heads/master Commit: bc40ed85e5c97dddd86ce6421feb50c7c92a54c8 Parents: 767f54c Author: Rohit Yadav Authored: Fri Jan 25 17:42:04 2013 -0800 Committer: Rohit Yadav Committed: Fri Jan 25 17:43:37 2013 -0800 ---------------------------------------------------------------------- test/integration/smoke/test_vm_life_cycle.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bc40ed85/test/integration/smoke/test_vm_life_cycle.py ---------------------------------------------------------------------- diff --git a/test/integration/smoke/test_vm_life_cycle.py b/test/integration/smoke/test_vm_life_cycle.py index 0bd4f95..0834f5d 100644 --- a/test/integration/smoke/test_vm_life_cycle.py +++ b/test/integration/smoke/test_vm_life_cycle.py @@ -864,6 +864,9 @@ class TestVMLifeCycle(cloudstackTestCase): name='expunge.interval' ) expunge_cycle = int(config[0].value)*2 + if expunge_cycle < 600: + expunge_cycle = 600*2 + while expunge_cycle > 0: list_vm_response = list_virtual_machines( self.apiclient,