D1546: run-tests: make "| foo (re)" not match everything
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Thu Nov 30 07:59:16 EST 2017
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG6d5718e39657: run-tests: make "| foo (re)" not match everything (authored by martinvonz, committed by ).
CHANGED PRIOR TO COMMIT
https://phab.mercurial-scm.org/D1546?vs=3965&id=4012#toc
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1546?vs=3965&id=4012
REVISION DETAIL
https://phab.mercurial-scm.org/D1546
AFFECTED FILES
tests/run-tests.py
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
@@ -98,19 +98,22 @@
test churn with globs
$ cat > test-failure.t <<EOF
- > $ echo "bar-baz"; echo "bar-bad"
+ > $ echo "bar-baz"; echo "bar-bad"; echo foo
> bar*bad (glob)
> bar*baz (glob)
+ > | fo (re)
> EOF
$ rt test-failure.t
--- $TESTTMP/test-failure.t
+++ $TESTTMP/test-failure.t.err
- @@ -1,3 +1,3 @@
- $ echo "bar-baz"; echo "bar-bad"
+ @@ -1,4 +1,4 @@
+ $ echo "bar-baz"; echo "bar-bad"; echo foo
+ bar*baz (glob)
bar*bad (glob)
- bar*baz (glob)
+ - | fo (re)
+ + foo
ERROR: test-failure.t output changed
!
@@ -126,11 +129,13 @@
\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;90;01m@@ -1,3 +1,3 @@\x1b[39;00m (esc)
- $ echo "bar-baz"; echo "bar-bad"
+ \x1b[38;5;90;01m@@ -1,4 +1,4 @@\x1b[39;00m (esc)
+ $ echo "bar-baz"; echo "bar-bad"; echo foo
\x1b[38;5;34m+ bar*baz (glob)\x1b[39m (esc)
bar*bad (glob)
\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)
!
@@ -145,11 +150,13 @@
--- $TESTTMP/test-failure.t
+++ $TESTTMP/test-failure.t.err
- @@ -1,3 +1,3 @@
- $ echo "bar-baz"; echo "bar-bad"
+ @@ -1,4 +1,4 @@
+ $ echo "bar-baz"; echo "bar-bad"; echo foo
+ bar*baz (glob)
bar*bad (glob)
- bar*baz (glob)
+ - | fo (re)
+ + foo
ERROR: test-failure.t output changed
!
diff --git a/tests/run-tests.py b/tests/run-tests.py
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -1527,6 +1527,7 @@
@staticmethod
def rematch(el, l):
try:
+ el = b'(?:' + el + b')'
# use \Z to ensure that the regex matches to the end of the string
if os.name == 'nt':
return re.match(el + br'\r?\n\Z', l)
To: martinvonz, #hg-reviewers, quark, yuja
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list