You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/03/24 12:28:28 UTC
[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 <ro...@shapeblue.com>
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 <ga...@clogeny.com>
Authored: Mon Feb 23 02:48:16 2015 -0800
Committer: Rohit Yadav <ro...@shapeblue.com>
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,
[2/2] git commit: updated refs/heads/master to 78fd8cf
Posted by bh...@apache.org.
Setting the default value of flag to False
This closes #127
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/78fd8cf2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/78fd8cf2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/78fd8cf2
Branch: refs/heads/master
Commit: 78fd8cf2cf2e54cc44ee314cff9b580d8ad3d16c
Parents: 54a4b2b
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Tue Mar 24 10:16:01 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Tue Mar 24 16:58:11 2015 +0530
----------------------------------------------------------------------
tools/marvin/marvin/config/test_data.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/78fd8cf2/tools/marvin/marvin/config/test_data.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/config/test_data.py b/tools/marvin/marvin/config/test_data.py
index 28eae42..bda57a3 100644
--- a/tools/marvin/marvin/config/test_data.py
+++ b/tools/marvin/marvin/config/test_data.py
@@ -1493,7 +1493,7 @@ test_data = {
"ldapPassword": ""
},
"systemVmDelay": 120,
- "setUsageConfigurationThroughTestCase": True,
+ "setUsageConfigurationThroughTestCase": False,
"vmware_cluster" : {
"hypervisor": 'VMware',
"clustertype": 'ExternalManaged',