Mercurial > public > mercurial-scm > hg-stable
diff tests/common-pattern.py @ 35450:991e4404e910
tests: convert the 'file://\$TESTTMP' rule to an automatic substitution
The rule only triggered on non Windows platforms, even though Windows also
required an adjustment. Automatic seems better.
The aggressive globbing in test-subrepo-svn.t was found and rewritten by the
substitution.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sat, 16 Dec 2017 11:32:10 -0500 |
parents | ad5f2b923b0d |
children | 24528dba0e64 |
line wrap: on
line diff
--- a/tests/common-pattern.py Sat Oct 21 17:27:14 2017 +0900 +++ b/tests/common-pattern.py Sat Dec 16 11:32:10 2017 -0500 @@ -38,6 +38,14 @@ (br' - - \[\d\d/.../2\d\d\d \d\d:\d\d:\d\d] "GET', br' - - [$LOGDATE$] "GET' ), + # Windows has an extra '/' in the following lines that get globbed away: + # pushing to file:/*/$TESTTMP/r2 (glob) + # comparing with file:/*/$TESTTMP/r2 (glob) + # sub/maybelarge.dat: largefile 34..9c not available from + # file:/*/$TESTTMP/largefiles-repo (glob) + (br'(.*file:/)/?(/\$TESTTMP.*)', + lambda m: m.group(1) + b'*' + m.group(2) + b' (glob)' + ), ] # Various platform error strings, keyed on a common replacement string