Show More
@@ -1155,7 +1155,7 b' class TestResult(unittest._TextTestResul' | |||||
1155 | if self.showAll: |
|
1155 | if self.showAll: | |
1156 | self.stream.writeln('ignored %s' % reason) |
|
1156 | self.stream.writeln('ignored %s' % reason) | |
1157 | else: |
|
1157 | else: | |
1158 | if reason != 'not retesting': |
|
1158 | if reason != 'not retesting' and reason != "doesn't match keyword": | |
1159 | self.stream.write('i') |
|
1159 | self.stream.write('i') | |
1160 | else: |
|
1160 | else: | |
1161 | self.testsRun += 1 |
|
1161 | self.testsRun += 1 |
@@ -114,8 +114,8 b' successful' | |||||
114 |
|
114 | |||
115 | success w/ keyword |
|
115 | success w/ keyword | |
116 | $ $TESTDIR/run-tests.py --with-hg=`which hg` -k xyzzy |
|
116 | $ $TESTDIR/run-tests.py --with-hg=`which hg` -k xyzzy | |
117 |
|
|
117 | . | |
118 |
# Ran |
|
118 | # Ran 2 tests, 1 skipped, 0 warned, 0 failed. | |
119 |
|
119 | |||
120 | failed |
|
120 | failed | |
121 |
|
121 | |||
@@ -139,7 +139,7 b' failed' | |||||
139 |
|
139 | |||
140 | failure w/ keyword |
|
140 | failure w/ keyword | |
141 | $ $TESTDIR/run-tests.py --with-hg=`which hg` -k rataxes |
|
141 | $ $TESTDIR/run-tests.py --with-hg=`which hg` -k rataxes | |
142 |
|
|
142 | ||
143 | --- $TESTTMP/test-failure.t |
|
143 | --- $TESTTMP/test-failure.t | |
144 | +++ $TESTTMP/test-failure.t.err |
|
144 | +++ $TESTTMP/test-failure.t.err | |
145 | @@ -1,4 +1,4 @@ |
|
145 | @@ -1,4 +1,4 @@ | |
@@ -152,7 +152,7 b' failure w/ keyword' | |||||
152 | ERROR: test-failure.t output changed |
|
152 | ERROR: test-failure.t output changed | |
153 | ! |
|
153 | ! | |
154 | Failed test-failure.t: output changed |
|
154 | Failed test-failure.t: output changed | |
155 |
# Ran |
|
155 | # Ran 2 tests, 1 skipped, 0 warned, 1 failed. | |
156 | python hash seed: * (glob) |
|
156 | python hash seed: * (glob) | |
157 | [1] |
|
157 | [1] | |
158 |
|
158 | |||
@@ -320,19 +320,19 b' Skips' | |||||
320 | [1] |
|
320 | [1] | |
321 |
|
321 | |||
322 | $ $TESTDIR/run-tests.py --with-hg=`which hg` --keyword xyzzy |
|
322 | $ $TESTDIR/run-tests.py --with-hg=`which hg` --keyword xyzzy | |
323 |
|
|
323 | .s | |
324 | Skipped test-skip.t: irrelevant |
|
324 | Skipped test-skip.t: irrelevant | |
325 |
# Ran |
|
325 | # Ran 2 tests, 2 skipped, 0 warned, 0 failed. | |
326 |
|
326 | |||
327 | Skips with xml |
|
327 | Skips with xml | |
328 | $ $TESTDIR/run-tests.py --with-hg=`which hg` --keyword xyzzy \ |
|
328 | $ $TESTDIR/run-tests.py --with-hg=`which hg` --keyword xyzzy \ | |
329 | > --xunit=xunit.xml |
|
329 | > --xunit=xunit.xml | |
330 |
|
|
330 | .s | |
331 | Skipped test-skip.t: irrelevant |
|
331 | Skipped test-skip.t: irrelevant | |
332 |
# Ran |
|
332 | # Ran 2 tests, 2 skipped, 0 warned, 0 failed. | |
333 | $ cat xunit.xml |
|
333 | $ cat xunit.xml | |
334 | <?xml version="1.0" encoding="utf-8"?> |
|
334 | <?xml version="1.0" encoding="utf-8"?> | |
335 |
<testsuite errors="0" failures="0" name="run-tests" skipped="2" tests=" |
|
335 | <testsuite errors="0" failures="0" name="run-tests" skipped="2" tests="2"> | |
336 | <testcase name="test-success.t" time="*"/> (glob) |
|
336 | <testcase name="test-success.t" time="*"/> (glob) | |
337 | </testsuite> |
|
337 | </testsuite> | |
338 |
|
338 |
General Comments 0
You need to be logged in to leave comments.
Login now