This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1545

tests: fix regex in test-subrepo-git.t to match entire string
ClosedPublic

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

Details

Reviewers
quark
yuja
Group Reviewers
hg-reviewers
Commits
rHG4c04fd032af6: tests: fix regex in test-subrepo-git.t to match entire string
Summary

Due to a bug in the test runner (fixed by the next commit), the regex
used for matching lines like " foobar | 2 +-" stoppped at the "|" and
the test passed even though the rest of the line did not match. The
test seems to have been supposed to match "|" and "+" literally on
those lines, so this changes the regex to escape those characters. It
also changes a "\s*" to "\s+" since I think we'll always include a
space after the "|" in the diffstat output.

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, 3:20 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 rHG4c04fd032af6: tests: fix regex in test-subrepo-git.t to match entire string (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/test-subrepo-git.t (4 lines)

Diff 4011

tests/test-subrepo-git.t

foo foo
bar bar
execute a diffstat execute a diffstat
the output contains a regex, because git 1.7.10 and 1.7.11 the output contains a regex, because git 1.7.10 and 1.7.11
change the amount of whitespace change the amount of whitespace
$ hg diff --subrepos --stat $ hg diff --subrepos --stat
\s*barfoo |\s*1 + (re) \s*barfoo \|\s+1 \+ (re)
\s*foobar |\s*2 +- (re) \s*foobar \|\s+2 \+- (re)
2 files changed, 2 insertions\(\+\), 1 deletions?\(-\) (re) 2 files changed, 2 insertions\(\+\), 1 deletions?\(-\) (re)
adding an include should ignore the other elements adding an include should ignore the other elements
$ hg diff --subrepos -I s/foobar $ hg diff --subrepos -I s/foobar
diff --git a/s/foobar b/s/foobar diff --git a/s/foobar b/s/foobar
index 8a5a5e2..bd5812a 100644 index 8a5a5e2..bd5812a 100644
--- a/s/foobar --- a/s/foobar
+++ b/s/foobar +++ b/s/foobar