# HG changeset patch # User Matt Mackall # Date 2014-08-12 05:33:48 # Node ID 3b5cf39ffcc4535a37adcf37ebaaf0e2ccffbc8d # Parent 70bdf59d27b61d9ae27a9c3e4258f81d6b4c4b2d run-tests: don't show 'i' for tests that don't match a keyword diff --git a/tests/run-tests.py b/tests/run-tests.py --- a/tests/run-tests.py +++ b/tests/run-tests.py @@ -1155,7 +1155,7 @@ class TestResult(unittest._TextTestResul if self.showAll: self.stream.writeln('ignored %s' % reason) else: - if reason != 'not retesting': + if reason != 'not retesting' and reason != "doesn't match keyword": self.stream.write('i') else: self.testsRun += 1 diff --git a/tests/test-run-tests.t b/tests/test-run-tests.t --- a/tests/test-run-tests.t +++ b/tests/test-run-tests.t @@ -114,8 +114,8 @@ successful success w/ keyword $ $TESTDIR/run-tests.py --with-hg=`which hg` -k xyzzy - i. - # Ran 1 tests, 1 skipped, 0 warned, 0 failed. + . + # Ran 2 tests, 1 skipped, 0 warned, 0 failed. failed @@ -139,7 +139,7 @@ failed failure w/ keyword $ $TESTDIR/run-tests.py --with-hg=`which hg` -k rataxes - i + --- $TESTTMP/test-failure.t +++ $TESTTMP/test-failure.t.err @@ -1,4 +1,4 @@ @@ -152,7 +152,7 @@ failure w/ keyword ERROR: test-failure.t output changed ! Failed test-failure.t: output changed - # Ran 1 tests, 1 skipped, 0 warned, 1 failed. + # Ran 2 tests, 1 skipped, 0 warned, 1 failed. python hash seed: * (glob) [1] @@ -320,19 +320,19 @@ Skips [1] $ $TESTDIR/run-tests.py --with-hg=`which hg` --keyword xyzzy - i.s + .s Skipped test-skip.t: irrelevant - # Ran 1 tests, 2 skipped, 0 warned, 0 failed. + # Ran 2 tests, 2 skipped, 0 warned, 0 failed. Skips with xml $ $TESTDIR/run-tests.py --with-hg=`which hg` --keyword xyzzy \ > --xunit=xunit.xml - i.s + .s Skipped test-skip.t: irrelevant - # Ran 1 tests, 2 skipped, 0 warned, 0 failed. + # Ran 2 tests, 2 skipped, 0 warned, 0 failed. $ cat xunit.xml - + (glob)