You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/06/21 15:47:39 UTC
svn commit: r1495443 - in /accumulo/trunk: ./ assemble/ core/ examples/
fate/src/main/java/org/apache/accumulo/fate/
fate/src/main/java/org/apache/accumulo/fate/zookeeper/ proxy/ server/ src/
test/system/auto/
Author: ecn
Date: Fri Jun 21 13:47:38 2013
New Revision: 1495443
URL: http://svn.apache.org/r1495443
Log:
ACCUMULO-1526 provide an xml report format, trunk
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/assemble/ (props changed)
accumulo/trunk/core/ (props changed)
accumulo/trunk/examples/ (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed)
accumulo/trunk/pom.xml (props changed)
accumulo/trunk/proxy/README (props changed)
accumulo/trunk/server/ (props changed)
accumulo/trunk/src/ (props changed)
accumulo/trunk/test/system/auto/run.py
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5:r1495441
Merged /accumulo/branches/1.4:r1495439
Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/assemble:r1495439
Merged /accumulo/branches/1.5/assemble:r1495441
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/core:r1495441
Merged /accumulo/branches/1.4/core:r1495439
Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/examples:r1495441
Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1495441
Merged /accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1495439
Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1495441
Merged /accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1495439
Propchange: accumulo/trunk/pom.xml
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/pom.xml:r1495441
Propchange: accumulo/trunk/proxy/README
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/proxy/README:r1495439
Merged /accumulo/branches/1.5/proxy/README:r1495441
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/server:r1495439
Merged /accumulo/branches/1.5/server:r1495441
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src:r1495439
Merged /accumulo/branches/1.5/src:r1495441
Modified: accumulo/trunk/test/system/auto/run.py
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/system/auto/run.py?rev=1495443&r1=1495442&r2=1495443&view=diff
==============================================================================
--- accumulo/trunk/test/system/auto/run.py (original)
+++ accumulo/trunk/test/system/auto/run.py Fri Jun 21 13:47:38 2013
@@ -242,6 +242,8 @@ def main():
help='Do not clean up at the end of the test.')
parser.add_option('-s', '--start', dest='start', default=None,
help='Start the test list at the given test name')
+ parser.add_option('-x', '--xml', dest='xmlreport', default=False, action='store_true',
+ help='Output tests results to xml (jenkins conpatible)')
allTests = getTests()
options = parseArguments(parser, allTests)
@@ -269,7 +271,12 @@ def main():
print "ZOOKEEPER_HOME needs to be set"
sys.exit(1)
- runner = TestRunner()
+ if options.xmlreport:
+ import xmlrunner
+ runner = xmlrunner.XMLTestRunner(output='test-reports')
+ else:
+ runner = TestRunner()
+
suite = unittest.TestSuite()
map(suite.addTest, filtered)