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

enhancement related to -x to take directory name/path to store xml reports

This commit is contained in:
Talluri 2012-07-09 12:39:14 +05:30
parent 44079c7180
commit 757a087c7f
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/marvin/marvin/TestCaseExecuteEngine.py
View File

@ -23,7 +23,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
@ -51,6 +51,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 """
@ -87,4 +91,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)

10
tools/marvin/marvin/deployAndRun.py
View File

@ -26,7 +26,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
@ -43,7 +43,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:
@ -55,7 +57,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:
@ -63,6 +65,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()