This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1816

tests: make #testcase available as env var in test
ClosedPublic

Authored by martinvonz on Jan 5 2018, 3:03 PM.

Details

Reviewers
quark
yuja
Group Reviewers
hg-reviewers
Commits
rHGf04d16bef2c7: tests: make #testcase available as env var in test
Summary

It can be useful for e.g. helper functions to behave differently
depending on which test case is being executed. This patch helps with
that by making the #testcase case available as a TESTCASE environment
variable.

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.Jan 5 2018, 3:03 PM
quark added inline comments.Jan 5 2018, 3:56 PM
tests/run-tests.py
1338

Maybe util.shellquote the name.

quark accepted this revision.Jan 5 2018, 3:57 PM
martinvonz marked an inline comment as done.Jan 5 2018, 4:05 PM
martinvonz updated this revision to Diff 4716.
martinvonz marked an inline comment as not done.Jan 5 2018, 4:06 PM
martinvonz added inline comments.
tests/run-tests.py
1338

Done (but it seems to be just shellquote in the test runner).

yuja requested changes to this revision.Jan 5 2018, 9:38 PM
yuja added a subscriber: yuja.
yuja added inline comments.
tests/run-tests.py
1338

Needs export TESTCASE to export shell variables to environment.

This revision now requires changes to proceed.Jan 5 2018, 9:38 PM
martinvonz marked an inline comment as not done.Jan 6 2018, 1:20 AM
martinvonz added inline comments.
tests/run-tests.py
1338

Needs export TESTCASE to export shell variables to environment.

Sure, will do. I wasn't sure if I should or shouldn't. Are you thinking that it may be useful if the function in my test case is instead a stand-alone script/binary?

martinvonz updated this revision to Diff 4730.Jan 6 2018, 1:32 AM
yuja accepted this revision.Jan 6 2018, 2:27 AM

Are you thinking that it may be useful if the function in my test case is instead a stand-alone script/binary?

No idea if it'll be useful, but there seemed no reason to narrow the scope
of $TESTCASE variable.

Queued, thanks.

This revision is now accepted and ready to land.Jan 6 2018, 2:27 AM
Closed by commit rHGf04d16bef2c7: tests: make #testcase available as env var in test (authored by martinvonz). · Explain WhyJan 6 2018, 2:40 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/run-tests.py (3 lines)
Mtests/test-run-tests.t (20 lines)

Diff 4733

tests/run-tests.py

inpython = False inpython = False
if self._debug: if self._debug:
script.append(b'set -x\n') script.append(b'set -x\n')
if self._hgcommand != b'hg': if self._hgcommand != b'hg':
script.append(b'alias hg="%s"\n' % self._hgcommand) script.append(b'alias hg="%s"\n' % self._hgcommand)
if os.getenv('MSYSTEM'): if os.getenv('MSYSTEM'):
script.append(b'alias pwd="pwd -W"\n') script.append(b'alias pwd="pwd -W"\n')
if self._case:
script.append(b'TESTCASE=%s\n' % shellquote(self._case))
quarkUnsubmitted
Not Done

Maybe util.shellquote the name.

quark: Maybe `util.shellquote` the name.
martinvonzAuthorUnsubmitted
Not Done

Done (but it seems to be just shellquote in the test runner).

martinvonz: Done (but it seems to be just `shellquote` in the test runner).
yujaUnsubmitted
Not Done

Needs export TESTCASE to export shell variables to environment.

yuja: Needs `export TESTCASE` to export shell variables to environment.
martinvonzAuthorUnsubmitted
Not Done

Needs export TESTCASE to export shell variables to environment.

Sure, will do. I wasn't sure if I should or shouldn't. Are you thinking that it may be useful if the function in my test case is instead a stand-alone script/binary?

martinvonz: > Needs `export TESTCASE` to export shell variables to environment. Sure, will do. I wasn't…
script.append(b'export TESTCASE\n')
n = 0 n = 0
for n, l in enumerate(lines): for n, l in enumerate(lines):
if not l.endswith(b'\n'): if not l.endswith(b'\n'):
l += b'\n' l += b'\n'
if l.startswith(b'#require'): if l.startswith(b'#require'):
lsplit = l.split() lsplit = l.split()
if len(lsplit) < 2 or lsplit[0] != b'#require': if len(lsplit) < 2 or lsplit[0] != b'#require':

tests/test-run-tests.t

ERROR: test-cases-abc.t (case B) output changed ERROR: test-cases-abc.t (case B) output changed
!. !.
Failed test-cases-abc.t (case B): output changed Failed test-cases-abc.t (case B): output changed
# Ran 2 tests, 0 skipped, 1 failed. # Ran 2 tests, 0 skipped, 1 failed.
python hash seed: * (glob) python hash seed: * (glob)
[1] [1]
Test TESTCASE variable
$ cat > test-cases-ab.t <<'EOF'
> $ dostuff() {
> > echo "In case $TESTCASE"
> > }
> #testcases A B
> #if A
> $ dostuff
> In case A
> #endif
> #if B
> $ dostuff
> In case B
> #endif
> EOF
$ rt test-cases-ab.t
..
# Ran 2 tests, 0 skipped, 0 failed.
Test automatic pattern replacement Test automatic pattern replacement
$ cat << EOF >> common-pattern.py $ cat << EOF >> common-pattern.py
> substitutions = [ > substitutions = [
> (br'foo-(.*)\\b', > (br'foo-(.*)\\b',
> br'\$XXX=\\1\$'), > br'\$XXX=\\1\$'),
> (br'bar\\n', > (br'bar\\n',
> br'\$YYY$\\n'), > br'\$YYY$\\n'),