You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by gi...@apache.org on 2014/05/06 12:00:57 UTC
[23/32] git commit: updated refs/heads/4.4-forward to 8546f76
Fix few issues seen in run.
Signed-off-by: Santhosh Edukulla <Sa...@citrix.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/80121f6b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/80121f6b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/80121f6b
Branch: refs/heads/4.4-forward
Commit: 80121f6be736283c5a485595bcb54c41b28787fa
Parents: cfa783f
Author: Santhosh Edukulla <Sa...@citrix.com>
Authored: Wed Apr 30 17:45:14 2014 +1000
Committer: SrikanteswaraRao Talluri <ta...@apache.org>
Committed: Wed Apr 30 13:55:29 2014 +0530
----------------------------------------------------------------------
test/integration/smoke/test_deploy_vm_root_resize.py | 2 +-
tools/marvin/marvin/configGenerator.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/80121f6b/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 e758ffd..8097d08 100644
--- a/test/integration/smoke/test_deploy_vm_root_resize.py
+++ b/test/integration/smoke/test_deploy_vm_root_resize.py
@@ -81,7 +81,7 @@ class TestDeployVM(cloudstackTestCase):
self.testdata["mode"] = self.zone.networktype
self.template = get_template(self.apiclient, self.zone.id, self.testdata["ostype"])
if self.template == FAILED:
- assert False, "get_template() failed to return template with description %s" % self.services["ostype"]
+ assert False, "get_template() failed to return template "
# 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'})
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/80121f6b/tools/marvin/marvin/configGenerator.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/configGenerator.py b/tools/marvin/marvin/configGenerator.py
index 2a67bc1..4f03fd0 100644
--- a/tools/marvin/marvin/configGenerator.py
+++ b/tools/marvin/marvin/configGenerator.py
@@ -381,7 +381,7 @@ class ConfigManager(object):
config_dict = test_data
else:
configLines = []
- with open(file, 'r') as fp:
+ with open(self.__filePath, 'r') as fp:
for line in fp:
ws = line.strip()
if not ws.startswith("#"):