apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-5674: Added few changes for CLOUDSTACK-567

Browse Source
This commit is contained in:
Santhosh Edukulla 2014-02-26 10:42:45 +05:30 committed by Girish Shilamkar
parent bf77e9d669
commit 23e059b1b9
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/marvin/marvin/marvinPlugin.py
View File

@ -99,7 +99,7 @@ class MarvinPlugin(Plugin):
dest="deployDc", dest="deployDc",
help="Deploys the DC with Given Configuration." help="Deploys the DC with Given Configuration."
"Requires only when DC needs to be deployed") "Requires only when DC needs to be deployed")
parser.add_option("--zone", action="store_true", parser.add_option("--zone", action="store",
default=None, default=None,
dest="zone", dest="zone",
help="Runs all tests against this specified zone") help="Runs all tests against this specified zone")
@ -260,11 +260,18 @@ class MarvinPlugin(Plugin):
self.__zoneForTests) self.__zoneForTests)
if not obj_marvininit or obj_marvininit.init() != SUCCESS: if not obj_marvininit or obj_marvininit.init() != SUCCESS:
return FAILED return FAILED
print "\n*******Now Start Running Test Suites***" print "\n====Now Start Running Test Suites===="
if len(self.conf.testNames) == 0: if len(self.conf.testNames) == 0:
print "\n*** No Test Suites are provided, please check**" if self.conf.workingDir == '':
print "\n==== " \
"No Test Suites are provided, please check ===="
return FAILED return FAILED
for suites in self.conf.testNames: else:
if self.conf.workingDir != '':
test_names = self.conf.workingDir
else:
test_names = self.conf.testNames
for suites in test_names:
if os.path.isdir(suites): if os.path.isdir(suites):
self.__runSuites(suites) self.__runSuites(suites)
if os.path.isfile(suites): if os.path.isfile(suites):