From 5ad31da1dc751e0a358f1657dee98c5bd3b1b7c6 Mon Sep 17 00:00:00 2001 From: Gaurav Aradhye Date: Mon, 23 Feb 2015 02:48:16 -0800 Subject: [PATCH 1/2] CLOUDSTACK-8278: Usage test path - Correct code flow in case the usage job configuration is not to be set through test case --- test/integration/testpaths/testpath_usage.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/integration/testpaths/testpath_usage.py b/test/integration/testpaths/testpath_usage.py index 17d56ccfb04f..e45221c01af8 100644 --- a/test/integration/testpaths/testpath_usage.py +++ b/test/integration/testpaths/testpath_usage.py @@ -91,6 +91,10 @@ def setUpClass(cls): "setUsageConfigurationThroughTestCase"]: cls.setUsageConfiguration() cls.RestartServers() + else: + currentMgtSvrTime = cls.getCurrentMgtSvrTime() + dateTimeSplit = currentMgtSvrTime.split("/") + cls.curDate = dateTimeSplit[0] cls.hypervisor = testClient.getHypervisorInfo() @@ -2966,6 +2970,10 @@ def setUpClass(cls): "setUsageConfigurationThroughTestCase"]: cls.setUsageConfiguration() cls.RestartServers() + else: + currentMgtSvrTime = cls.getCurrentMgtSvrTime() + dateTimeSplit = currentMgtSvrTime.split("/") + cls.curDate = dateTimeSplit[0] cls.template = get_template( cls.apiclient, From 71653dc1388f431e9bb4e7758cc43a813902e12b Mon Sep 17 00:00:00 2001 From: Gaurav Aradhye Date: Tue, 24 Mar 2015 10:16:01 +0530 Subject: [PATCH 2/2] Setting the default value of flag to False --- tools/marvin/marvin/config/test_data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/marvin/marvin/config/test_data.py b/tools/marvin/marvin/config/test_data.py index 80ead64c45bb..c6ce5858f5eb 100644 --- a/tools/marvin/marvin/config/test_data.py +++ b/tools/marvin/marvin/config/test_data.py @@ -1484,7 +1484,7 @@ "ldapPassword": "" }, "systemVmDelay": 120, - "setUsageConfigurationThroughTestCase": True, + "setUsageConfigurationThroughTestCase": False, "vmware_cluster" : { "hypervisor": 'VMware', "clustertype": 'ExternalManaged',