This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11001

run-tests: also catch double-escapes for $TESTTMP
ClosedPublic

Authored by Alphare on Jul 7 2021, 9:14 AM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHGe9c5c368be17: run-tests: also catch double-escapes for $TESTTMP
Summary

On Windows the $TESTTMP string "repr" is different than its value, because \ become \\. We introduce a new $STR_REPR_TESTTMP substitution to match that too.

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

Alphare created this revision.Jul 7 2021, 9:14 AM
Alphare updated this revision to Diff 28938.Jul 7 2021, 10:03 AM
marmoute requested changes to this revision.Jul 7 2021, 11:55 AM
marmoute added a subscriber: marmoute.

This seems wrong. What is displayed here is not TESTTMP it is a stringencoded vesion of TESTTMP. We should use a different variable substitution for that something like STR_REPR_TESTTMP.

This revision now requires changes to proceed.Jul 7 2021, 11:55 AM
marmoute updated this revision to Diff 29039.Jul 9 2021, 7:44 AM
marmoute accepted this revision.Jul 9 2021, 8:34 PM
baymax updated this revision to Diff 29072.Jul 9 2021, 9:21 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 29092.Jul 9 2021, 11:41 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

marmoute edited the summary of this revision. (Show Details)Jul 10 2021, 1:44 PM
Alphare added a commit: rHGe9c5c368be17: run-tests: also catch double-escapes for $TESTTMP.Jul 11 2021, 10:46 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGe9c5c368be17: run-tests: also catch double-escapes for $TESTTMP (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/run-tests.py (5 lines)
Mtests/test-paths.t (6 lines)

Diff 29186

tests/run-tests.py

# This list should be parallel to defineport in _getenv # This list should be parallel to defineport in _getenv
self._portmap(0), self._portmap(0),
self._portmap(1), self._portmap(1),
self._portmap(2), self._portmap(2),
(br'([^0-9])%s' % re.escape(self._localip()), br'\1$LOCALIP'), (br'([^0-9])%s' % re.escape(self._localip()), br'\1$LOCALIP'),
(br'\bHG_TXNID=TXN:[a-f0-9]{40}\b', br'HG_TXNID=TXN:$ID$'), (br'\bHG_TXNID=TXN:[a-f0-9]{40}\b', br'HG_TXNID=TXN:$ID$'),
] ]
r.append((self._escapepath(self._testtmp), b'$TESTTMP')) r.append((self._escapepath(self._testtmp), b'$TESTTMP'))
if os.name == 'nt':
# JSON output escapes backslashes in Windows paths, so also catch a
# double-escape.
replaced = self._testtmp.replace(b'\\', br'\\')
r.append((self._escapepath(replaced), b'$STR_REPR_TESTTMP'))
replacementfile = os.path.join(self._testdir, b'common-pattern.py') replacementfile = os.path.join(self._testdir, b'common-pattern.py')
if os.path.exists(replacementfile): if os.path.exists(replacementfile):
data = {} data = {}
with open(replacementfile, mode='rb') as source: with open(replacementfile, mode='rb') as source:
# the intermediate 'compile' step help with debugging # the intermediate 'compile' step help with debugging
code = compile(source.read(), replacementfile, 'exec') code = compile(source.read(), replacementfile, 'exec')

tests/test-paths.t

$ hg log -rnull -T '{join(peerurls, "\n")}\n' $ hg log -rnull -T '{join(peerurls, "\n")}\n'
dupe=$TESTTMP/b#tip dupe=$TESTTMP/b#tip
expand=$TESTTMP/a/$SOMETHING/bar expand=$TESTTMP/a/$SOMETHING/bar
$ hg log -rnull -T '{peerurls % "{name}: {url}\n"}' $ hg log -rnull -T '{peerurls % "{name}: {url}\n"}'
dupe: $TESTTMP/b#tip dupe: $TESTTMP/b#tip
expand: $TESTTMP/a/$SOMETHING/bar expand: $TESTTMP/a/$SOMETHING/bar
$ hg log -rnull -T '{get(peerurls, "dupe")}\n' $ hg log -rnull -T '{get(peerurls, "dupe")}\n'
$TESTTMP/b#tip $TESTTMP/b#tip
#if windows
$ hg log -rnull -T '{peerurls % "{urls|json}\n"}'
[{"pushurl": "https://example.com/dupe", "url": "$STR_REPR_TESTTMP\\b#tip"}]
[{"url": "$STR_REPR_TESTTMP\\a\\$SOMETHING\\bar"}]
#else
$ hg log -rnull -T '{peerurls % "{urls|json}\n"}' $ hg log -rnull -T '{peerurls % "{urls|json}\n"}'
[{"pushurl": "https://example.com/dupe", "url": "$TESTTMP/b#tip"}] [{"pushurl": "https://example.com/dupe", "url": "$TESTTMP/b#tip"}]
[{"url": "$TESTTMP/a/$SOMETHING/bar"}] [{"url": "$TESTTMP/a/$SOMETHING/bar"}]
#endif
(sub options can be populated by map/dot operation) (sub options can be populated by map/dot operation)
$ hg log -rnull \ $ hg log -rnull \
> -T '{get(peerurls, "dupe") % "url: {url}\npushurl: {pushurl}\n"}' > -T '{get(peerurls, "dupe") % "url: {url}\npushurl: {pushurl}\n"}'
url: $TESTTMP/b#tip url: $TESTTMP/b#tip
pushurl: https://example.com/dupe pushurl: https://example.com/dupe
$ hg log -rnull -T '{peerurls.dupe.pushurl}\n' $ hg log -rnull -T '{peerurls.dupe.pushurl}\n'