##// END OF EJS Templates
run-tests: report skipped tests as "skipped" - they might still be "relevant"
Mads Kiilerich -
r22292:102f0e92 default
parent child Browse files
Show More
@@ -546,7 +546,7 b' class Test(unittest.TestCase):'
546 missing, failed = TTest.parsehghaveoutput(out)
546 missing, failed = TTest.parsehghaveoutput(out)
547
547
548 if not missing:
548 if not missing:
549 missing = ['irrelevant']
549 missing = ['skipped']
550
550
551 if failed:
551 if failed:
552 self.fail('hg have failed checking for %s' % failed[-1])
552 self.fail('hg have failed checking for %s' % failed[-1])
@@ -325,7 +325,7 b' Skips'
325 > EOF
325 > EOF
326 $ $TESTDIR/run-tests.py --with-hg=`which hg` --nodiff
326 $ $TESTDIR/run-tests.py --with-hg=`which hg` --nodiff
327 !.s
327 !.s
328 Skipped test-skip.t: irrelevant
328 Skipped test-skip.t: skipped
329 Failed test-failure.t: output changed
329 Failed test-failure.t: output changed
330 # Ran 2 tests, 1 skipped, 0 warned, 1 failed.
330 # Ran 2 tests, 1 skipped, 0 warned, 1 failed.
331 python hash seed: * (glob)
331 python hash seed: * (glob)
@@ -333,14 +333,14 b' Skips'
333
333
334 $ $TESTDIR/run-tests.py --with-hg=`which hg` --keyword xyzzy
334 $ $TESTDIR/run-tests.py --with-hg=`which hg` --keyword xyzzy
335 .s
335 .s
336 Skipped test-skip.t: irrelevant
336 Skipped test-skip.t: skipped
337 # Ran 2 tests, 2 skipped, 0 warned, 0 failed.
337 # Ran 2 tests, 2 skipped, 0 warned, 0 failed.
338
338
339 Skips with xml
339 Skips with xml
340 $ $TESTDIR/run-tests.py --with-hg=`which hg` --keyword xyzzy \
340 $ $TESTDIR/run-tests.py --with-hg=`which hg` --keyword xyzzy \
341 > --xunit=xunit.xml
341 > --xunit=xunit.xml
342 .s
342 .s
343 Skipped test-skip.t: irrelevant
343 Skipped test-skip.t: skipped
344 # Ran 2 tests, 2 skipped, 0 warned, 0 failed.
344 # Ran 2 tests, 2 skipped, 0 warned, 0 failed.
345 $ cat xunit.xml
345 $ cat xunit.xml
346 <?xml version="1.0" encoding="utf-8"?>
346 <?xml version="1.0" encoding="utf-8"?>
General Comments 0
You need to be logged in to leave comments. Login now