lothiraldan created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION 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).
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D5965
AFFECTED FILES
tests/test-run-tests.t
CHANGE DETAILS
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
@@ -1174,31 +1174,31 @@
$ cat report.json
testreport ={
"test-failure.t": [\{] (re)
- "csys": "\s*[\d\.]{4,5}", ? (re)
- "cuser": "\s*[\d\.]{4,5}", ? (re)
+ "csys": "\d+\.\d{3,4}", ? (re)
+ "cuser": "\d+\.\d{3,4}", ? (re)
"diff": "---.+\+\+\+.+", ? (re)
- "end": "\s*[\d\.]{4,5}", ? (re)
+ "end": "\d+\.\d{3,4}", ? (re)
"result": "failure", ? (re)
- "start": "\s*[\d\.]{4,5}", ? (re)
- "time": "\s*[\d\.]{4,5}" (re)
+ "start": "\d+\.\d{3,4}", ? (re)
+ "time": "\d+\.\d{3,4}" (re)
}, ? (re)
"test-skip.t": {
- "csys": "\s*[\d\.]{4,5}", ? (re)
- "cuser": "\s*[\d\.]{4,5}", ? (re)
+ "csys": "\d+\.\d{3,4}", ? (re)
+ "cuser": "\d+\.\d{3,4}", ? (re)
"diff": "", ? (re)
- "end": "\s*[\d\.]{4,5}", ? (re)
+ "end": "\d+\.\d{3,4}", ? (re)
"result": "skip", ? (re)
- "start": "\s*[\d\.]{4,5}", ? (re)
- "time": "\s*[\d\.]{4,5}" (re)
+ "start": "\d+\.\d{3,4}", ? (re)
+ "time": "\d+\.\d{3,4}" (re)
}, ? (re)
"test-success.t": [\{] (re)
- "csys": "\s*[\d\.]{4,5}", ? (re)
- "cuser": "\s*[\d\.]{4,5}", ? (re)
+ "csys": "\d+\.\d{3,4}", ? (re)
+ "cuser": "\d+\.\d{3,4}", ? (re)
"diff": "", ? (re)
- "end": "\s*[\d\.]{4,5}", ? (re)
+ "end": "\d+\.\d{3,4}", ? (re)
"result": "success", ? (re)
- "start": "\s*[\d\.]{4,5}", ? (re)
- "time": "\s*[\d\.]{4,5}" (re)
+ "start": "\d+\.\d{3,4}", ? (re)
+ "time": "\d+\.\d{3,4}" (re)
}
} (no-eol)
--json with --outputdir
@@ -1231,31 +1231,31 @@
$ cat output/report.json
testreport ={
"test-failure.t": [\{] (re)
- "csys": "\s*[\d\.]{4,5}", ? (re)
- "cuser": "\s*[\d\.]{4,5}", ? (re)
+ "csys": "\d+\.\d{3,4}", ? (re)
+ "cuser": "\d+\.\d{3,4}", ? (re)
"diff": "---.+\+\+\+.+", ? (re)
- "end": "\s*[\d\.]{4,5}", ? (re)
+ "end": "\d+\.\d{3,4}", ? (re)
"result": "failure", ? (re)
- "start": "\s*[\d\.]{4,5}", ? (re)
- "time": "\s*[\d\.]{4,5}" (re)
+ "start": "\d+\.\d{3,4}", ? (re)
+ "time": "\d+\.\d{3,4}" (re)
}, ? (re)
"test-skip.t": {
- "csys": "\s*[\d\.]{4,5}", ? (re)
- "cuser": "\s*[\d\.]{4,5}", ? (re)
+ "csys": "\d+\.\d{3,4}", ? (re)
+ "cuser": "\d+\.\d{3,4}", ? (re)
"diff": "", ? (re)
- "end": "\s*[\d\.]{4,5}", ? (re)
+ "end": "\d+\.\d{3,4}", ? (re)
"result": "skip", ? (re)
- "start": "\s*[\d\.]{4,5}", ? (re)
- "time": "\s*[\d\.]{4,5}" (re)
+ "start": "\d+\.\d{3,4}", ? (re)
+ "time": "\d+\.\d{3,4}" (re)
}, ? (re)
"test-success.t": [\{] (re)
- "csys": "\s*[\d\.]{4,5}", ? (re)
- "cuser": "\s*[\d\.]{4,5}", ? (re)
+ "csys": "\d+\.\d{3,4}", ? (re)
+ "cuser": "\d+\.\d{3,4}", ? (re)
"diff": "", ? (re)
- "end": "\s*[\d\.]{4,5}", ? (re)
+ "end": "\d+\.\d{3,4}", ? (re)
"result": "success", ? (re)
- "start": "\s*[\d\.]{4,5}", ? (re)
- "time": "\s*[\d\.]{4,5}" (re)
+ "start": "\d+\.\d{3,4}", ? (re)
+ "time": "\d+\.\d{3,4}" (re)
}
} (no-eol)
$ ls -a output
@@ -1287,31 +1287,31 @@
$ cat report.json
testreport ={
"test-failure.t": [\{] (re)
- "csys": "\s*[\d\.]{4,5}", ? (re)
- "cuser": "\s*[\d\.]{4,5}", ? (re)
+ "csys": "\d+\.\d{3,4}", ? (re)
+ "cuser": "\d+\.\d{3,4}", ? (re)
"diff": "", ? (re)
- "end": "\s*[\d\.]{4,5}", ? (re)
+ "end": "\d+\.\d{3,4}", ? (re)
"result": "success", ? (re)
- "start": "\s*[\d\.]{4,5}", ?
