You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2012/07/30 12:07:19 UTC
[10/16] git commit: enhancement related to -x to take directory
name/path to store xml reports
enhancement related to -x to take directory name/path to store xml reports
Conflicts:
tools/marvin/marvin/TestCaseExecuteEngine.py
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/db5687d6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/db5687d6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/db5687d6
Branch: refs/heads/master
Commit: db5687d69182574ae439e4caa4e4181eb38c03a4
Parents: 91b6e09
Author: Prasanna Santhanam <Pr...@citrix.com>
Authored: Mon Jul 9 12:39:14 2012 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Mon Jul 30 15:32:24 2012 +0530
----------------------------------------------------------------------
tools/marvin/marvin/TestCaseExecuteEngine.py | 8 ++++++--
tools/marvin/marvin/deployAndRun.py | 10 ++++++----
2 files changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/db5687d6/tools/marvin/marvin/TestCaseExecuteEngine.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/TestCaseExecuteEngine.py b/tools/marvin/marvin/TestCaseExecuteEngine.py
index 07df563..52a6dac 100644
--- a/tools/marvin/marvin/TestCaseExecuteEngine.py
+++ b/tools/marvin/marvin/TestCaseExecuteEngine.py
@@ -27,7 +27,7 @@ def testCaseLogger(message, logger=None):
logger.debug(message)
class TestCaseExecuteEngine(object):
- def __init__(self, testclient, testcaseLogFile=None, testResultLogFile=None, format="text"):
+ def __init__(self, testclient, testcaseLogFile=None, testResultLogFile=None, format="text", xmlDir="xml-reports"):
"""
Initialize the testcase execution engine, just the basics here
@var testcaseLogFile: client log file
@@ -55,6 +55,10 @@ class TestCaseExecuteEngine(object):
self.testResultLogFile = fp
else:
self.testResultLogFile = sys.stdout
+ if self.format == "xml" and (xmlDir is not None):
+ self.xmlDir = xmlDir
+
+
def loadTestsFromDir(self, testDirectory):
""" Load the test suites from a package with multiple test files """
@@ -91,4 +95,4 @@ class TestCaseExecuteEngine(object):
if self.format == "text":
unittest.TextTestRunner(stream=self.testResultLogFile, verbosity=2).run(self.suite)
elif self.format == "xml":
- xmlrunner.XMLTestRunner(output='xml-reports', verbose=True).run(self.suite)
+ xmlrunner.XMLTestRunner(output=self.xmlDir, verbose=True).run(self.suite)
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/db5687d6/tools/marvin/marvin/deployAndRun.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/deployAndRun.py b/tools/marvin/marvin/deployAndRun.py
index 80d74e4..5b9e4dc 100644
--- a/tools/marvin/marvin/deployAndRun.py
+++ b/tools/marvin/marvin/deployAndRun.py
@@ -31,7 +31,7 @@ if __name__ == "__main__":
parser.add_option("-l", "--load", dest="load", action="store_true", help="only load config, do not deploy, it will only run testcase")
parser.add_option("-f", "--file", dest="module", help="run tests in the given file")
parser.add_option("-n", "--nose", dest="nose", action="store_true", help="run tests using nose")
- parser.add_option("-x", "--xml", dest="xmlrunner", action="store_true", help="use the xml runner to generate xml reports")
+ parser.add_option("-x", "--xml", dest="xmlrunner", action="store", default="./xml-reports", help="use the xml runner to generate xml reports and path to store xml files")
(options, args) = parser.parse_args()
testResultLogFile = None
@@ -48,7 +48,9 @@ if __name__ == "__main__":
deploy.deploy()
format = "text"
- if options.xmlrunner:
+ xmlDir = "xml-reports"
+ if options.xmlrunner is not None:
+ xmlDir = options.xmlrunner
format = "xml"
if options.testCaseFolder is None:
@@ -60,7 +62,7 @@ if __name__ == "__main__":
engine = NoseTestExecuteEngine.NoseTestExecuteEngine(deploy.testClient, testCaseLogFile, testResultLogFile, format)
engine.runTestsFromFile(options.module)
else:
- engine = TestCaseExecuteEngine.TestCaseExecuteEngine(deploy.testClient, testCaseLogFile, testResultLogFile, format)
+ engine = TestCaseExecuteEngine.TestCaseExecuteEngine(deploy.testClient, testCaseLogFile, testResultLogFile, format, xmlDir)
engine.loadTestsFromFile(options.module)
engine.run()
else:
@@ -68,6 +70,6 @@ if __name__ == "__main__":
engine = NoseTestExecuteEngine.NoseTestExecuteEngine(deploy.testClient, clientLog=testCaseLogFile, resultLog=testResultLogFile, workingdir=options.testCaseFolder, format=format)
engine.runTests()
else:
- engine = TestCaseExecuteEngine.TestCaseExecuteEngine(deploy.testClient, testCaseLogFile, testResultLogFile, format)
+ engine = TestCaseExecuteEngine.TestCaseExecuteEngine(deploy.testClient, testCaseLogFile, testResultLogFile, format, xmlDir)
engine.loadTestsFromDir(options.testCaseFolder)
engine.run()