Mercurial > hg

comparison tests/test-run-tests.t @ 43070:1d60a7825dcb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: conditionalize test-run-tests.t for Python 3.8 It looks like Python 3.8 changed the pretty XML formatting slightly to strip some whitespace. Let's teach our tests about that. Differential Revision: https://phab.mercurial-scm.org/D6988
author Gregory Szorc <gregory.szorc@gmail.com>
date Sat, 05 Oct 2019 16:23:00 -0400
parents 2c1a484ce4d4
children 617cd3b1e9cd
comparison
equal deleted inserted replaced
43069:e554cfd93975 43070:1d60a7825dcb
401 $ cat xunit.xml 401 $ cat xunit.xml
402 <?xml version="1.0" encoding="utf-8"?> 402 <?xml version="1.0" encoding="utf-8"?>
403 <testsuite errors="0" failures="2" name="run-tests" skipped="0" tests="3"> 403 <testsuite errors="0" failures="2" name="run-tests" skipped="0" tests="3">
404 <testcase name="test-success.t" time="*"/> (glob) 404 <testcase name="test-success.t" time="*"/> (glob)
405 <testcase name="test-failure-unicode.t" time="*"> (glob) 405 <testcase name="test-failure-unicode.t" time="*"> (glob)
406 <failure message="output changed" type="output-mismatch"> 406 <failure message="output changed" type="output-mismatch"><![CDATA[--- $TESTTMP/test-failure-unicode.t (py38 !)
407 <![CDATA[--- $TESTTMP/test-failure-unicode.t 407 <failure message="output changed" type="output-mismatch"> (no-py38 !)
408 <![CDATA[--- $TESTTMP/test-failure-unicode.t (no-py38 !)
408 +++ $TESTTMP/test-failure-unicode.t.err 409 +++ $TESTTMP/test-failure-unicode.t.err
409 @@ -1,2 +1,2 @@ 410 @@ -1,2 +1,2 @@
410 $ echo babar\xce\xb1 (esc) 411 $ echo babar\xce\xb1 (esc)
411 - l\xce\xb5\xce\xb5t (esc) 412 - l\xce\xb5\xce\xb5t (esc)
412 + babar\xce\xb1 (esc) 413 + babar\xce\xb1 (esc)
413 ]]> </failure> 414 ]]></failure> (py38 !)
415 ]]> </failure> (no-py38 !)
414 </testcase> 416 </testcase>
415 <testcase name="test-failure.t" time="*"> (glob) 417 <testcase name="test-failure.t" time="*"> (glob)
416 <failure message="output changed" type="output-mismatch"> 418 <failure message="output changed" type="output-mismatch"><![CDATA[--- $TESTTMP/test-failure.t (py38 !)
417 <![CDATA[--- $TESTTMP/test-failure.t 419 <failure message="output changed" type="output-mismatch"> (no-py38 !)
420 <![CDATA[--- $TESTTMP/test-failure.t (no-py38 !)
418 +++ $TESTTMP/test-failure.t.err 421 +++ $TESTTMP/test-failure.t.err
419 @@ -1,5 +1,5 @@ 422 @@ -1,5 +1,5 @@
420 $ echo babar 423 $ echo babar
421 - rataxes 424 - rataxes
422 + babar 425 + babar
423 This is a noop statement so that 426 This is a noop statement so that
424 this test is still more bytes than success. 427 this test is still more bytes than success.
425 pad pad pad pad............................................................ 428 pad pad pad pad............................................................
426 ]]> </failure> 429 ]]></failure> (py38 !)
430 ]]> </failure> (no-py38 !)
427 </testcase> 431 </testcase>
428 </testsuite> 432 </testsuite>
429 433
430 $ cat .testtimes 434 $ cat .testtimes
431 test-empty.t * (glob) 435 test-empty.t * (glob)
1082 $ cat xunit.xml 1086 $ cat xunit.xml
1083 <?xml version="1.0" encoding="utf-8"?> 1087 <?xml version="1.0" encoding="utf-8"?>
1084 <testsuite errors="0" failures="0" name="run-tests" skipped="2" tests="2"> 1088 <testsuite errors="0" failures="0" name="run-tests" skipped="2" tests="2">
1085 <testcase name="test-success.t" time="*"/> (glob) 1089 <testcase name="test-success.t" time="*"/> (glob)
1086 <testcase name="test-skip.t"> 1090 <testcase name="test-skip.t">
1087 <skipped> 1091 <skipped><![CDATA[missing feature: nail clipper]]></skipped> (py38 !)
1088 <![CDATA[missing feature: nail clipper]]> </skipped> 1092 <skipped> (no-py38 !)
1093 <![CDATA[missing feature: nail clipper]]> </skipped> (no-py38 !)
1089 </testcase> 1094 </testcase>
1090 </testsuite> 1095 </testsuite>
1091 1096
1092 Missing skips or blacklisted skips don't count as executed: 1097 Missing skips or blacklisted skips don't count as executed:
1093 $ echo test-failure.t > blacklist 1098 $ echo test-failure.t > blacklist