cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mlsoren...@apache.org
Subject [4/4] git commit: updated refs/heads/resize-root to 79bd6f1
Date Tue, 11 Mar 2014 00:13:05 GMT
resize-root: fix test_deploy_vm_root_resize to use default template


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/79bd6f1a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/79bd6f1a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/79bd6f1a

Branch: refs/heads/resize-root
Commit: 79bd6f1a75ee14fbc63d3c2a6697b960c3d54a8d
Parents: a0801a5
Author: Marcus Sorensen <marcus@betterservers.com>
Authored: Mon Feb 10 13:50:30 2014 -0700
Committer: Marcus Sorensen <marcus@betterservers.com>
Committed: Mon Feb 10 13:50:30 2014 -0700

----------------------------------------------------------------------
 test/integration/smoke/test_deploy_vm_root_resize.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/79bd6f1a/test/integration/smoke/test_deploy_vm_root_resize.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_deploy_vm_root_resize.py b/test/integration/smoke/test_deploy_vm_root_resize.py
index a6584a2..b24cf4d 100644
--- a/test/integration/smoke/test_deploy_vm_root_resize.py
+++ b/test/integration/smoke/test_deploy_vm_root_resize.py
@@ -76,8 +76,9 @@ class TestDeployVM(cloudstackTestCase):
         self.domain = get_domain(self.apiclient, self.testdata)
         self.zone = get_zone(self.apiclient, self.testdata)
         self.testdata["mode"] = self.zone.networktype
-#        self.template = get_template(self.apiclient, self.zone.id, self.testdata["ostype"])
-        self.template = get_template(self.apiclient, self.zone.id, self.testdata["ostype"],
templatetype='USER', services = {"template":'31f52a4d-5681-43f7-8651-ad4aaf823618'})
+        self.template = get_template(self.apiclient, self.zone.id, self.testdata["ostype"])
+#       for testing with specific template
+#        self.template = get_template(self.apiclient, self.zone.id, self.testdata["ostype"],
templatetype='USER', services = {"template":'31f52a4d-5681-43f7-8651-ad4aaf823618'})
         
 
         #create a user account


Mime
View raw message