( )⚙ D466 run-tests: make per-line condition support testcase names

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D466

run-tests: make per-line condition support testcase names
ClosedPublic

Authored by quark on Aug 21 2017, 7:19 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG6cc8f848b4c3: run-tests: make per-line condition support testcase names
Summary

7340465bd added multiple test cases support. The latter has a problem -
output lines cannot be made conditional with #if:

# COUNTEREXAMPLE: DOES NOT WORK
#testcases A B
  $ command-foo
  common ouput
#if A
  A's ouput
#else
  B's ouput
#endif
  common ouput

That's not trivial to fix (even if it works in test, run-tests.py -i may
be suboptimal because diff algorithm does not know how to skip the #if
lines, even if it does, it may have trouble figuring out whether a changed
line belongs to inside a #if block or outside).

Matching output lines conditionally is useful. 4eec2f04a added per-line
condition support for hghave. This patch extends that to also support test
case names.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

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

Diff 1133

tests/run-tests.py

if el.endswith(b" (?)\n"): if el.endswith(b" (?)\n"):
optional.append(i) optional.append(i)
else: else:
m = optline.match(el) m = optline.match(el)
if m: if m:
conditions = [ conditions = [
c for c in m.group(2).split(b' ')] c for c in m.group(2).split(b' ')]
if not self._hghave(conditions)[0]: if not self._iftest(conditions):
optional.append(i) optional.append(i)
i += 1 i += 1
if r: if r:
if r == "retry": if r == "retry":
continue continue
# clean up any optional leftovers # clean up any optional leftovers
while expected.get(pos, None): while expected.get(pos, None):
el = expected[pos].pop(0) el = expected[pos].pop(0)
if el: if el:
if not el.endswith(b" (?)\n"): if not el.endswith(b" (?)\n"):
m = optline.match(el) m = optline.match(el)
if m: if m:
conditions = [c for c in m.group(2).split(' ')] conditions = [c for c in m.group(2).split(' ')]
if self._hghave(conditions)[0]: if self._iftest(conditions):
# Don't append as optional line # Don't append as optional line
continue continue
else: else:
continue continue
postout.append(b' ' + el) postout.append(b' ' + el)
if lcmd: if lcmd:
# Add on last return code. # Add on last return code.
retry = "retry" retry = "retry"
el = el[:-5] + b"\n" el = el[:-5] + b"\n"
else: else:
m = optline.match(el) m = optline.match(el)
if m: if m:
conditions = [c for c in m.group(2).split(b' ')] conditions = [c for c in m.group(2).split(b' ')]
el = m.group(1) + b"\n" el = m.group(1) + b"\n"
if not self._hghave(conditions)[0]: if not self._iftest(conditions):
retry = "retry" # Not required by listed features retry = "retry" # Not required by listed features
if el.endswith(b" (esc)\n"): if el.endswith(b" (esc)\n"):
if PYTHON3: if PYTHON3:
el = el[:-7].decode('unicode_escape') + '\n' el = el[:-7].decode('unicode_escape') + '\n'
el = el.encode('utf-8') el = el.encode('utf-8')
else: else:
el = el[:-7].decode('string-escape') + '\n' el = el[:-7].decode('string-escape') + '\n'

tests/test-run-tests.t

$ echo 1 $ echo 1
1 1
#endif #endif
#if b #if b
$ echo 2 $ echo 2
2 2
#endif #endif
$ cat >> test-cases.t <<'EOF'
> #if a
> $ NAME=A
> #else
> $ NAME=B
> #endif
> $ echo $NAME
> A (a !)
> B (b !)
> EOF
$ rt test-cases.t
..
# Ran 2 tests, 0 skipped, 0 failed.
$ rm test-cases.t $ rm test-cases.t
(reinstall) (reinstall)
$ mv backup test-failure.t $ mv backup test-failure.t
No Diff No Diff
=============== ===============