etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix few issues seen in run. 

Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
This commit is contained in:
Santhosh Edukulla 2014-04-30 17:45:14 +10:00 committed by SrikanteswaraRao Talluri
parent 94ab870d42
commit bf54f74ffc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/integration/smoke/test_deploy_vm_root_resize.py
View File

@ -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'})

2
tools/marvin/marvin/configGenerator.py
View File

@ -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("#"):