This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6988

tests: conditionalize test-run-tests.t for Python 3.8
ClosedPublic

Authored by indygreg on Oct 5 2019, 4:23 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG1d60a7825dcb: tests: conditionalize test-run-tests.t for Python 3.8
Summary

It looks like Python 3.8 changed the pretty XML formatting slightly
to strip some whitespace. Let's teach our tests about that.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Oct 5 2019, 4:23 PM
indygreg set the repository for this revision to rHG Mercurial.Oct 6 2019, 10:40 AM
pulkit accepted this revision.Oct 6 2019, 10:41 AM
This revision is now accepted and ready to land.Oct 6 2019, 10:41 AM
indygreg added a commit: rHG1d60a7825dcb: tests: conditionalize test-run-tests.t for Python 3.8.Oct 6 2019, 11:05 AM
Closed by commit rHG1d60a7825dcb: tests: conditionalize test-run-tests.t for Python 3.8 (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-run-tests.t (21 lines)

Diff 16892

tests/test-run-tests.t

# Ran 3 tests, 0 skipped, 2 failed. # Ran 3 tests, 0 skipped, 2 failed.
python hash seed: * (glob) python hash seed: * (glob)
[1] [1]
$ cat xunit.xml $ cat xunit.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<testsuite errors="0" failures="2" name="run-tests" skipped="0" tests="3"> <testsuite errors="0" failures="2" name="run-tests" skipped="0" tests="3">
<testcase name="test-success.t" time="*"/> (glob) <testcase name="test-success.t" time="*"/> (glob)
<testcase name="test-failure-unicode.t" time="*"> (glob) <testcase name="test-failure-unicode.t" time="*"> (glob)
<failure message="output changed" type="output-mismatch"> <failure message="output changed" type="output-mismatch"><![CDATA[--- $TESTTMP/test-failure-unicode.t (py38 !)
<![CDATA[--- $TESTTMP/test-failure-unicode.t <failure message="output changed" type="output-mismatch"> (no-py38 !)
<![CDATA[--- $TESTTMP/test-failure-unicode.t (no-py38 !)
+++ $TESTTMP/test-failure-unicode.t.err +++ $TESTTMP/test-failure-unicode.t.err
@@ -1,2 +1,2 @@ @@ -1,2 +1,2 @@
$ echo babar\xce\xb1 (esc) $ echo babar\xce\xb1 (esc)
- l\xce\xb5\xce\xb5t (esc) - l\xce\xb5\xce\xb5t (esc)
+ babar\xce\xb1 (esc) + babar\xce\xb1 (esc)
]]> </failure> ]]></failure> (py38 !)
]]> </failure> (no-py38 !)
</testcase> </testcase>
<testcase name="test-failure.t" time="*"> (glob) <testcase name="test-failure.t" time="*"> (glob)
<failure message="output changed" type="output-mismatch"> <failure message="output changed" type="output-mismatch"><![CDATA[--- $TESTTMP/test-failure.t (py38 !)
<![CDATA[--- $TESTTMP/test-failure.t <failure message="output changed" type="output-mismatch"> (no-py38 !)
<![CDATA[--- $TESTTMP/test-failure.t (no-py38 !)
+++ $TESTTMP/test-failure.t.err +++ $TESTTMP/test-failure.t.err
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
$ echo babar $ echo babar
- rataxes - rataxes
+ babar + babar
This is a noop statement so that This is a noop statement so that
this test is still more bytes than success. this test is still more bytes than success.
pad pad pad pad............................................................ pad pad pad pad............................................................
]]> </failure> ]]></failure> (py38 !)
]]> </failure> (no-py38 !)
</testcase> </testcase>
</testsuite> </testsuite>
$ cat .testtimes $ cat .testtimes
test-empty.t * (glob) test-empty.t * (glob)
test-failure-globs.t * (glob) test-failure-globs.t * (glob)
test-failure-unicode.t * (glob) test-failure-unicode.t * (glob)
test-failure.t * (glob) test-failure.t * (glob)
.s .s
Skipped test-skip.t: missing feature: nail clipper Skipped test-skip.t: missing feature: nail clipper
# Ran 2 tests, 2 skipped, 0 failed. # Ran 2 tests, 2 skipped, 0 failed.
$ cat xunit.xml $ cat xunit.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<testsuite errors="0" failures="0" name="run-tests" skipped="2" tests="2"> <testsuite errors="0" failures="0" name="run-tests" skipped="2" tests="2">
<testcase name="test-success.t" time="*"/> (glob) <testcase name="test-success.t" time="*"/> (glob)
<testcase name="test-skip.t"> <testcase name="test-skip.t">
<skipped> <skipped><![CDATA[missing feature: nail clipper]]></skipped> (py38 !)
<![CDATA[missing feature: nail clipper]]> </skipped> <skipped> (no-py38 !)
<![CDATA[missing feature: nail clipper]]> </skipped> (no-py38 !)
</testcase> </testcase>
</testsuite> </testsuite>
Missing skips or blacklisted skips don't count as executed: Missing skips or blacklisted skips don't count as executed:
$ echo test-failure.t > blacklist $ echo test-failure.t > blacklist
$ rt --blacklist=blacklist --json\ $ rt --blacklist=blacklist --json\
> test-failure.t test-bogus.t > test-failure.t test-bogus.t
running 2 tests using 1 parallel processes running 2 tests using 1 parallel processes