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 2E7B917982 for ; Tue, 24 Mar 2015 11:35:08 +0000 (UTC) Received: (qmail 35618 invoked by uid 500); 24 Mar 2015 11:28:28 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 35582 invoked by uid 500); 24 Mar 2015 11:28:28 -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 35552 invoked by uid 99); 24 Mar 2015 11:28:28 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Mar 2015 11:28:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A6AC9DFBD7; Tue, 24 Mar 2015 11:28:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhaisaab@apache.org To: commits@cloudstack.apache.org Date: Tue, 24 Mar 2015 11:28:28 -0000 Message-Id: <94c73921282b42c3b74706d43bdd211a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: updated refs/heads/master to 78fd8cf Repository: cloudstack Updated Branches: refs/heads/master 191bcdd43 -> 78fd8cf2c CLOUDSTACK-8278: Usage test path - Correct code flow in case the usage job configuration is not to be set through test case Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/54a4b2ba Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/54a4b2ba Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/54a4b2ba Branch: refs/heads/master Commit: 54a4b2bad79321f241e97d19ce861dc0196ec946 Parents: 191bcdd Author: Gaurav Aradhye Authored: Mon Feb 23 02:48:16 2015 -0800 Committer: Rohit Yadav Committed: Tue Mar 24 16:58:07 2015 +0530 ---------------------------------------------------------------------- test/integration/testpaths/testpath_usage.py | 8 ++++++++ 1 file changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/54a4b2ba/test/integration/testpaths/testpath_usage.py ---------------------------------------------------------------------- diff --git a/test/integration/testpaths/testpath_usage.py b/test/integration/testpaths/testpath_usage.py index 17d56cc..e45221c 100644 --- a/test/integration/testpaths/testpath_usage.py +++ b/test/integration/testpaths/testpath_usage.py @@ -91,6 +91,10 @@ class TestUsage(cloudstackTestCase): "setUsageConfigurationThroughTestCase"]: cls.setUsageConfiguration() cls.RestartServers() + else: + currentMgtSvrTime = cls.getCurrentMgtSvrTime() + dateTimeSplit = currentMgtSvrTime.split("/") + cls.curDate = dateTimeSplit[0] cls.hypervisor = testClient.getHypervisorInfo() @@ -2966,6 +2970,10 @@ class TestUsageDirectMeteringBasicZone(cloudstackTestCase): "setUsageConfigurationThroughTestCase"]: cls.setUsageConfiguration() cls.RestartServers() + else: + currentMgtSvrTime = cls.getCurrentMgtSvrTime() + dateTimeSplit = currentMgtSvrTime.split("/") + cls.curDate = dateTimeSplit[0] cls.template = get_template( cls.apiclient,