From bf54f74ffcc0ff267c809fcd57db97d3cfb5f399 Mon Sep 17 00:00:00 2001 From: Santhosh Edukulla Date: Wed, 30 Apr 2014 17:45:14 +1000 Subject: [PATCH] Fix few issues seen in run. Signed-off-by: Santhosh Edukulla --- test/integration/smoke/test_deploy_vm_root_resize.py | 2 +- tools/marvin/marvin/configGenerator.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integration/smoke/test_deploy_vm_root_resize.py b/test/integration/smoke/test_deploy_vm_root_resize.py index e758ffd169a..8097d087b7a 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'}) diff --git a/tools/marvin/marvin/configGenerator.py b/tools/marvin/marvin/configGenerator.py index 2a67bc13828..4f03fd06868 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("#"):