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 <[email protected]> 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 <[email protected]> Authored: Mon Feb 23 02:48:16 2015 -0800 Committer: Rohit Yadav <[email protected]> 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,
