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/02/26 06:12:59 UTC
git commit: updated refs/heads/marvin to 23e059b
Repository: cloudstack
Updated Branches:
refs/heads/marvin bf77e9d66 -> 23e059b1b
CLOUDSTACK-5674: Added few changes for CLOUDSTACK-567
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/23e059b1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/23e059b1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/23e059b1
Branch: refs/heads/marvin
Commit: 23e059b1b903bff84155a116432ef02bfd078d9d
Parents: bf77e9d
Author: Santhosh Edukulla <Sa...@citrix.com>
Authored: Wed Feb 26 10:42:45 2014 +0530
Committer: Girish Shilamkar <gi...@clogeny.com>
Committed: Wed Feb 26 10:42:45 2014 +0530
----------------------------------------------------------------------
tools/marvin/marvin/marvinPlugin.py | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/23e059b1/tools/marvin/marvin/marvinPlugin.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/marvinPlugin.py b/tools/marvin/marvin/marvinPlugin.py
index 1ba883a..3a364b1 100644
--- a/tools/marvin/marvin/marvinPlugin.py
+++ b/tools/marvin/marvin/marvinPlugin.py
@@ -99,7 +99,7 @@ class MarvinPlugin(Plugin):
dest="deployDc",
help="Deploys the DC with Given Configuration."
"Requires only when DC needs to be deployed")
- parser.add_option("--zone", action="store_true",
+ parser.add_option("--zone", action="store",
default=None,
dest="zone",
help="Runs all tests against this specified zone")
@@ -260,11 +260,18 @@ class MarvinPlugin(Plugin):
self.__zoneForTests)
if not obj_marvininit or obj_marvininit.init() != SUCCESS:
return FAILED
- print "\n*******Now Start Running Test Suites***"
+ print "\n====Now Start Running Test Suites===="
if len(self.conf.testNames) == 0:
- print "\n*** No Test Suites are provided, please check**"
- return FAILED
- for suites in self.conf.testNames:
+ if self.conf.workingDir == '':
+ print "\n==== " \
+ "No Test Suites are provided, please check ===="
+ return FAILED
+ 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):
self.__runSuites(suites)
if os.path.isfile(suites):