( )⚙ D1546 run-tests: make "| foo (re)" not match everything

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1546

run-tests: make "| foo (re)" not match everything
ClosedPublic

Authored by martinvonz on Nov 29 2017, 2:21 PM.

Details

Reviewers
quark
yuja
Group Reviewers
hg-reviewers
Commits
rHG6d5718e39657: run-tests: make "| foo (re)" not match everything
Summary

We make "foo (re)" match the entire line by adding a \Z to the regular
expression before matching. However, that doesn't help when the
regular expression is something like "| foo", because that gets
translated to "| foo\Z", where the "|" has lower precedence and it
thus matches the empty string, which is of course a prefix of every
string. Fix by wrapping expression in a group before adding the \Z to
the end.

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

martinvonz created this revision.Nov 29 2017, 2:21 PM
quark accepted this revision.Nov 29 2017, 2:43 PM
yuja accepted this revision.Nov 30 2017, 7:42 AM
This revision is now accepted and ready to land.Nov 30 2017, 7:42 AM
Closed by commit rHG6d5718e39657: run-tests: make "| foo (re)" not match everything (authored by martinvonz). · Explain WhyNov 30 2017, 7:58 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 4012

tests/run-tests.py

if warnonly == 2: if warnonly == 2:
exitcode = False # Set exitcode to warned. exitcode = False # Set exitcode to warned.
return exitcode, postout return exitcode, postout
@staticmethod @staticmethod
def rematch(el, l): def rematch(el, l):
try: try:
el = b'(?:' + el + b')'
# use \Z to ensure that the regex matches to the end of the string # use \Z to ensure that the regex matches to the end of the string
if os.name == 'nt': if os.name == 'nt':
return re.match(el + br'\r?\n\Z', l) return re.match(el + br'\r?\n\Z', l)
return re.match(el + br'\n\Z', l) return re.match(el + br'\n\Z', l)
except re.error: except re.error:
# el is an invalid regex # el is an invalid regex
return False return False

tests/test-run-tests.t

. .
# Ran 1 tests, 0 skipped, 0 failed. # Ran 1 tests, 0 skipped, 0 failed.
failing test failing test
================== ==================
test churn with globs test churn with globs
$ cat > test-failure.t <<EOF $ cat > test-failure.t <<EOF
> $ echo "bar-baz"; echo "bar-bad" > $ echo "bar-baz"; echo "bar-bad"; echo foo
> bar*bad (glob) > bar*bad (glob)
> bar*baz (glob) > bar*baz (glob)
> | fo (re)
> EOF > EOF
$ rt test-failure.t $ rt test-failure.t
--- $TESTTMP/test-failure.t --- $TESTTMP/test-failure.t
+++ $TESTTMP/test-failure.t.err +++ $TESTTMP/test-failure.t.err
@@ -1,3 +1,3 @@ @@ -1,4 +1,4 @@
$ echo "bar-baz"; echo "bar-bad" $ echo "bar-baz"; echo "bar-bad"; echo foo
+ bar*baz (glob) + bar*baz (glob)
bar*bad (glob) bar*bad (glob)
- bar*baz (glob) - bar*baz (glob)
- | fo (re)
+ foo
ERROR: test-failure.t output changed ERROR: test-failure.t output changed
! !
Failed test-failure.t: output changed Failed test-failure.t: output changed
# Ran 1 tests, 0 skipped, 1 failed. # Ran 1 tests, 0 skipped, 1 failed.
python hash seed: * (glob) python hash seed: * (glob)
[1] [1]
test diff colorisation test diff colorisation
#if no-windows pygments #if no-windows pygments
$ rt test-failure.t --color always $ rt test-failure.t --color always
\x1b[38;5;124m--- $TESTTMP/test-failure.t\x1b[39m (esc) \x1b[38;5;124m--- $TESTTMP/test-failure.t\x1b[39m (esc)
\x1b[38;5;34m+++ $TESTTMP/test-failure.t.err\x1b[39m (esc) \x1b[38;5;34m+++ $TESTTMP/test-failure.t.err\x1b[39m (esc)
\x1b[38;5;90;01m@@ -1,3 +1,3 @@\x1b[39;00m (esc) \x1b[38;5;90;01m@@ -1,4 +1,4 @@\x1b[39;00m (esc)
$ echo "bar-baz"; echo "bar-bad" $ echo "bar-baz"; echo "bar-bad"; echo foo
\x1b[38;5;34m+ bar*baz (glob)\x1b[39m (esc) \x1b[38;5;34m+ bar*baz (glob)\x1b[39m (esc)
bar*bad (glob) bar*bad (glob)
\x1b[38;5;124m- bar*baz (glob)\x1b[39m (esc) \x1b[38;5;124m- bar*baz (glob)\x1b[39m (esc)
\x1b[38;5;124m- | fo (re)\x1b[39m (esc)
\x1b[38;5;34m+ foo\x1b[39m (esc)
\x1b[38;5;88mERROR: \x1b[39m\x1b[38;5;9mtest-failure.t\x1b[39m\x1b[38;5;88m output changed\x1b[39m (esc) \x1b[38;5;88mERROR: \x1b[39m\x1b[38;5;9mtest-failure.t\x1b[39m\x1b[38;5;88m output changed\x1b[39m (esc)
! !
\x1b[38;5;88mFailed \x1b[39m\x1b[38;5;9mtest-failure.t\x1b[39m\x1b[38;5;88m: output changed\x1b[39m (esc) \x1b[38;5;88mFailed \x1b[39m\x1b[38;5;9mtest-failure.t\x1b[39m\x1b[38;5;88m: output changed\x1b[39m (esc)
# Ran 1 tests, 0 skipped, 1 failed. # Ran 1 tests, 0 skipped, 1 failed.
python hash seed: * (glob) python hash seed: * (glob)
[1] [1]
$ rt test-failure.t 2> tmp.log $ rt test-failure.t 2> tmp.log
[1] [1]
$ cat tmp.log $ cat tmp.log
--- $TESTTMP/test-failure.t --- $TESTTMP/test-failure.t
+++ $TESTTMP/test-failure.t.err +++ $TESTTMP/test-failure.t.err
@@ -1,3 +1,3 @@ @@ -1,4 +1,4 @@
$ echo "bar-baz"; echo "bar-bad" $ echo "bar-baz"; echo "bar-bad"; echo foo
+ bar*baz (glob) + bar*baz (glob)
bar*bad (glob) bar*bad (glob)
- bar*baz (glob) - bar*baz (glob)
- | fo (re)
+ foo
ERROR: test-failure.t output changed ERROR: test-failure.t output changed
! !
Failed test-failure.t: output changed Failed test-failure.t: output changed
# Ran 1 tests, 0 skipped, 1 failed. # Ran 1 tests, 0 skipped, 1 failed.
python hash seed: * (glob) python hash seed: * (glob)
#endif #endif