This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5965

test: stabilize test-run-tests.t output
AbandonedPublic

Authored by lothiraldan on Feb 14 2019, 9:38 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

We have reached a point where the duration in test-run-tests.t were greater
or equal than 10s, which doesn't match anymore the regex. For example here:
https://ci.octobus.net/blue/organizations/jenkins/MercurialPy2/detail/MercurialPy2/276/pipeline

           "diff": "", ? (re)
-          "end": "\s*[\d\.]{4,5}", ? (re)
+          "end": "10.040",
           "result": "skip", ? (re)

Instead of accepting more characters, I changed the regex to accept any number
of digits before the . than 3 or 4 digits after. This way the regex is more
precise (only one . is authorized and we can ensure that the precision
doesn't change).

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

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

Diff 14094

tests/test-run-tests.t

Failed test-failure.t: output changed Failed test-failure.t: output changed
# Ran 2 tests, 1 skipped, 1 failed. # Ran 2 tests, 1 skipped, 1 failed.
python hash seed: * (glob) python hash seed: * (glob)
[1] [1]
$ cat report.json $ cat report.json
testreport ={ testreport ={
"test-failure.t": [\{] (re) "test-failure.t": [\{] (re)
"csys": "\s*[\d\.]{4,5}", ? (re) "csys": "\d+\.\d{3,4}", ? (re)
"cuser": "\s*[\d\.]{4,5}", ? (re) "cuser": "\d+\.\d{3,4}", ? (re)
"diff": "---.+\+\+\+.+", ? (re) "diff": "---.+\+\+\+.+", ? (re)
"end": "\s*[\d\.]{4,5}", ? (re) "end": "\d+\.\d{3,4}", ? (re)
"result": "failure", ? (re) "result": "failure", ? (re)
"start": "\s*[\d\.]{4,5}", ? (re) "start": "\d+\.\d{3,4}", ? (re)
"time": "\s*[\d\.]{4,5}" (re) "time": "\d+\.\d{3,4}" (re)
}, ? (re) }, ? (re)
"test-skip.t": { "test-skip.t": {
"csys": "\s*[\d\.]{4,5}", ? (re) "csys": "\d+\.\d{3,4}", ? (re)
"cuser": "\s*[\d\.]{4,5}", ? (re) "cuser": "\d+\.\d{3,4}", ? (re)
"diff": "", ? (re) "diff": "", ? (re)
"end": "\s*[\d\.]{4,5}", ? (re) "end": "\d+\.\d{3,4}", ? (re)
"result": "skip", ? (re) "result": "skip", ? (re)
"start": "\s*[\d\.]{4,5}", ? (re) "start": "\d+\.\d{3,4}", ? (re)
"time": "\s*[\d\.]{4,5}" (re) "time": "\d+\.\d{3,4}" (re)
}, ? (re) }, ? (re)
"test-success.t": [\{] (re) "test-success.t": [\{] (re)
"csys": "\s*[\d\.]{4,5}", ? (re) "csys": "\d+\.\d{3,4}", ? (re)
"cuser": "\s*[\d\.]{4,5}", ? (re) "cuser": "\d+\.\d{3,4}", ? (re)
"diff": "", ? (re) "diff": "", ? (re)
"end": "\s*[\d\.]{4,5}", ? (re) "end": "\d+\.\d{3,4}", ? (re)
"result": "success", ? (re) "result": "success", ? (re)
"start": "\s*[\d\.]{4,5}", ? (re) "start": "\d+\.\d{3,4}", ? (re)
"time": "\s*[\d\.]{4,5}" (re) "time": "\d+\.\d{3,4}" (re)
} }
} (no-eol) } (no-eol)
--json with --outputdir --json with --outputdir
$ rm report.json $ rm report.json
$ rm -r output $ rm -r output
$ mkdir output $ mkdir output
$ rt --json --outputdir output $ rt --json --outputdir output
# Ran 2 tests, 1 skipped, 1 failed. # Ran 2 tests, 1 skipped, 1 failed.
python hash seed: * (glob) python hash seed: * (glob)
[1] [1]
$ f report.json $ f report.json
report.json: file not found report.json: file not found
$ cat output/report.json $ cat output/report.json
testreport ={ testreport ={
"test-failure.t": [\{] (re) "test-failure.t": [\{] (re)
"csys": "\s*[\d\.]{4,5}", ? (re) "csys": "\d+\.\d{3,4}", ? (re)
"cuser": "\s*[\d\.]{4,5}", ? (re) "cuser": "\d+\.\d{3,4}", ? (re)
"diff": "---.+\+\+\+.+", ? (re) "diff": "---.+\+\+\+.+", ? (re)
"end": "\s*[\d\.]{4,5}", ? (re) "end": "\d+\.\d{3,4}", ? (re)
"result": "failure", ? (re) "result": "failure", ? (re)
"start": "\s*[\d\.]{4,5}", ? (re) "start": "\d+\.\d{3,4}", ? (re)
"time": "\s*[\d\.]{4,5}" (re) "time": "\d+\.\d{3,4}" (re)
}, ? (re) }, ? (re)
"test-skip.t": { "test-skip.t": {
"csys": "\s*[\d\.]{4,5}", ? (re) "csys": "\d+\.\d{3,4}", ? (re)
"cuser": "\s*[\d\.]{4,5}", ? (re) "cuser": "\d+\.\d{3,4}", ? (re)
"diff": "", ? (re) "diff": "", ? (re)
"end": "\s*[\d\.]{4,5}", ? (re) "end": "\d+\.\d{3,4}", ? (re)
"result": "skip", ? (re) "result": "skip", ? (re)
"start": "\s*[\d\.]{4,5}", ? (re) "start": "\d+\.\d{3,4}", ? (re)
"time": "\s*[\d\.]{4,5}" (re) "time": "\d+\.\d{3,4}" (re)
}, ? (re) }, ? (re)
"test-success.t": [\{] (re) "test-success.t": [\{] (re)
"csys": "\s*[\d\.]{4,5}", ? (re) "csys": "\d+\.\d{3,4}", ? (re)
"cuser": "\s*[\d\.]{4,5}", ? (re) "cuser": "\d+\.\d{3,4}", ? (re)
"diff": "", ? (re) "diff": "", ? (re)
"end": "\s*[\d\.]{4,5}", ? (re) "end": "\d+\.\d{3,4}", ? (re)
"result": "success", ? (re) "result": "success", ? (re)
"start": "\s*[\d\.]{4,5}", ? (re) "start": "\d+\.\d{3,4}", ? (re)
"time": "\s*[\d\.]{4,5}" (re) "time": "\d+\.\d{3,4}" (re)
} }
} (no-eol) } (no-eol)
$ ls -a output $ ls -a output
. .
.. ..
.testtimes .testtimes
report.json report.json
test-failure.t.err test-failure.t.err
pad pad pad pad............................................................ pad pad pad pad............................................................
Accept this change? [n] ..s Accept this change? [n] ..s
Skipped test-skip.t: missing feature: nail clipper Skipped test-skip.t: missing feature: nail clipper
# Ran 2 tests, 1 skipped, 0 failed. # Ran 2 tests, 1 skipped, 0 failed.
$ cat report.json $ cat report.json
testreport ={ testreport ={
"test-failure.t": [\{] (re) "test-failure.t": [\{] (re)
"csys": "\s*[\d\.]{4,5}", ? (re) "csys": "\d+\.\d{3,4}", ? (re)
"cuser": "\s*[\d\.]{4,5}", ? (re) "cuser": "\d+\.\d{3,4}", ? (re)
"diff": "", ? (re) "diff": "", ? (re)
"end": "\s*[\d\.]{4,5}", ? (re) "end": "\d+\.\d{3,4}", ? (re)
"result": "success", ? (re) "result": "success", ? (re)
"start": "\s*[\d\.]{4,5}", ? (re) "start": "\d+\.\d{3,4}", ? (re)
"time": "\s*[\d\.]{4,5}" (re) "time": "\d+\.\d{3,4}" (re)
}, ? (re) }, ? (re)
"test-skip.t": { "test-skip.t": {
"csys": "\s*[\d\.]{4,5}", ? (re) "csys": "\d+\.\d{3,4}", ? (re)
"cuser": "\s*[\d\.]{4,5}", ? (re) "cuser": "\d+\.\d{3,4}", ? (re)
"diff": "", ? (re) "diff": "", ? (re)
"end": "\s*[\d\.]{4,5}", ? (re) "end": "\d+\.\d{3,4}", ? (re)
"result": "skip", ? (re) "result": "skip", ? (re)
"start": "\s*[\d\.]{4,5}", ? (re) "start": "\d+\.\d{3,4}", ? (re)
"time": "\s*[\d\.]{4,5}" (re) "time": "\d+\.\d{3,4}" (re)
}, ? (re) }, ? (re)
"test-success.t": [\{] (re) "test-success.t": [\{] (re)
"csys": "\s*[\d\.]{4,5}", ? (re) "csys": "\d+\.\d{3,4}", ? (re)
"cuser": "\s*[\d\.]{4,5}", ? (re) "cuser": "\d+\.\d{3,4}", ? (re)
"diff": "", ? (re) "diff": "", ? (re)
"end": "\s*[\d\.]{4,5}", ? (re) "end": "\d+\.\d{3,4}", ? (re)
"result": "success", ? (re) "result": "success", ? (re)
"start": "\s*[\d\.]{4,5}", ? (re) "start": "\d+\.\d{3,4}", ? (re)
"time": "\s*[\d\.]{4,5}" (re) "time": "\d+\.\d{3,4}" (re)
} }
} (no-eol) } (no-eol)
$ mv backup test-failure.t $ mv backup test-failure.t
backslash on end of line with glob matching is handled properly backslash on end of line with glob matching is handled properly
$ cat > test-glob-backslash.t << EOF $ cat > test-glob-backslash.t << EOF
> $ echo 'foo bar \\' > $ echo 'foo bar \\'