This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4052

testrunner: use "#" for "test cases" suffix in .err filename too
ClosedPublic

Authored by martinvonz on Aug 2 2018, 1:38 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGa9a4b0fc1e5d: testrunner: use "#" for "test cases" suffix in .err filename too
Summary

This seems like a natural follow-up to b865bba56db1 (run-tests: update
the test case name format, 2018-05-13).

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

PathPackages
Mtests/run-tests.py (4 lines)
Mtests/test-run-tests.t (26 lines)

Diff 9783

tests/run-tests.py

def __init__(self, path, *args, **kwds): def __init__(self, path, *args, **kwds):
# accept an extra "case" parameter # accept an extra "case" parameter
case = kwds.pop('case', None) case = kwds.pop('case', None)
self._case = case self._case = case
self._allcases = parsettestcases(path) self._allcases = parsettestcases(path)
super(TTest, self).__init__(path, *args, **kwds) super(TTest, self).__init__(path, *args, **kwds)
if case: if case:
self.name = '%s#%s' % (self.name, _strpath(case)) self.name = '%s#%s' % (self.name, _strpath(case))
self.errpath = b'%s.%s.err' % (self.errpath[:-4], case) self.errpath = b'%s#%s.err' % (self.errpath[:-4], case)
self._tmpname += b'-%s' % case self._tmpname += b'-%s' % case
self._have = {} self._have = {}
@property @property
def refpath(self): def refpath(self):
return os.path.join(self._testdir, self.bname) return os.path.join(self._testdir, self.bname)
def _run(self, env): def _run(self, env):
try: try:
if self.options.restart: if self.options.restart:
orig = list(testdescs) orig = list(testdescs)
while testdescs: while testdescs:
desc = testdescs[0] desc = testdescs[0]
# desc['path'] is a relative path # desc['path'] is a relative path
if 'case' in desc: if 'case' in desc:
errpath = b'%s.%s.err' % (desc['path'], desc['case']) errpath = b'%s#%s.err' % (desc['path'], desc['case'])
else: else:
errpath = b'%s.err' % desc['path'] errpath = b'%s.err' % desc['path']
errpath = os.path.join(self._outputdir, errpath) errpath = os.path.join(self._outputdir, errpath)
if os.path.exists(errpath): if os.path.exists(errpath):
break break
testdescs.pop(0) testdescs.pop(0)
if not testdescs: if not testdescs:
print("running all tests") print("running all tests")

tests/test-run-tests.t

> EOF > EOF
$ cat <<EOF | rt -i test-cases.t 2>&1 $ cat <<EOF | rt -i test-cases.t 2>&1
> y > y
> y > y
> EOF > EOF
--- $TESTTMP/test-cases.t --- $TESTTMP/test-cases.t
+++ $TESTTMP/test-cases.t.a.err +++ $TESTTMP/test-cases.t#a.err
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
#testcases a b #testcases a b
#if a #if a
$ echo 1 $ echo 1
+ 1 + 1
#endif #endif
#if b #if b
$ echo 2 $ echo 2
Accept this change? [n] . Accept this change? [n] .
--- $TESTTMP/test-cases.t --- $TESTTMP/test-cases.t
+++ $TESTTMP/test-cases.t.b.err +++ $TESTTMP/test-cases.t#b.err
@@ -5,4 +5,5 @@ @@ -5,4 +5,5 @@
#endif #endif
#if b #if b
$ echo 2 $ echo 2
+ 2 + 2
#endif #endif
Accept this change? [n] . Accept this change? [n] .
# Ran 2 tests, 0 skipped, 0 failed. # Ran 2 tests, 0 skipped, 0 failed.
> [1] > [1]
> #endif > #endif
> $ [ $V = D ] > $ [ $V = D ]
> [1] > [1]
> EOF > EOF
$ rt $ rt
. .
--- $TESTTMP/anothertests/cases/test-cases-abc.t --- $TESTTMP/anothertests/cases/test-cases-abc.t
+++ $TESTTMP/anothertests/cases/test-cases-abc.t.B.err +++ $TESTTMP/anothertests/cases/test-cases-abc.t#B.err
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
$ V=C $ V=C
#endif #endif
$ echo $V | sed 's/A/C/' $ echo $V | sed 's/A/C/'
- C - C
+ B + B
#if C #if C
$ [ $V = C ] $ [ $V = C ]
#endif #endif
ERROR: test-cases-abc.t#B output changed ERROR: test-cases-abc.t#B output changed
!. !.
Failed test-cases-abc.t#B: output changed Failed test-cases-abc.t#B: output changed
# Ran 3 tests, 0 skipped, 1 failed. # Ran 3 tests, 0 skipped, 1 failed.
python hash seed: * (glob) python hash seed: * (glob)
[1] [1]
--restart works --restart works
$ rt --restart $ rt --restart
--- $TESTTMP/anothertests/cases/test-cases-abc.t --- $TESTTMP/anothertests/cases/test-cases-abc.t
+++ $TESTTMP/anothertests/cases/test-cases-abc.t.B.err +++ $TESTTMP/anothertests/cases/test-cases-abc.t#B.err
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
$ V=C $ V=C
#endif #endif
$ echo $V | sed 's/A/C/' $ echo $V | sed 's/A/C/'
- C - C
+ B + B
#if C #if C
$ [ $V = C ] $ [ $V = C ]
#endif #endif
ERROR: test-cases-abc.t#B output changed ERROR: test-cases-abc.t#B output changed
!. !.
Failed test-cases-abc.t#B: output changed Failed test-cases-abc.t#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]
--restart works with outputdir --restart works with outputdir
$ mkdir output $ mkdir output
$ mv test-cases-abc.t.B.err output $ mv test-cases-abc.t#B.err output
$ rt --restart --outputdir output $ rt --restart --outputdir output
--- $TESTTMP/anothertests/cases/test-cases-abc.t --- $TESTTMP/anothertests/cases/test-cases-abc.t
+++ $TESTTMP/anothertests/cases/output/test-cases-abc.t.B.err +++ $TESTTMP/anothertests/cases/output/test-cases-abc.t#B.err
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
$ V=C $ V=C
#endif #endif
$ echo $V | sed 's/A/C/' $ echo $V | sed 's/A/C/'
- C - C
+ B + B
#if C #if C
$ [ $V = C ] $ [ $V = C ]
.. ..
# Ran 2 tests, 0 skipped, 0 failed. # Ran 2 tests, 0 skipped, 0 failed.
Support running a specific test case Support running a specific test case
$ rt "test-cases-abc.t#B" $ rt "test-cases-abc.t#B"
--- $TESTTMP/anothertests/cases/test-cases-abc.t --- $TESTTMP/anothertests/cases/test-cases-abc.t
+++ $TESTTMP/anothertests/cases/test-cases-abc.t.B.err +++ $TESTTMP/anothertests/cases/test-cases-abc.t#B.err
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
$ V=C $ V=C
#endif #endif
$ echo $V | sed 's/A/C/' $ echo $V | sed 's/A/C/'
- C - C
+ B + B
#if C #if C
$ [ $V = C ] $ [ $V = C ]
#endif #endif
ERROR: test-cases-abc.t#B output changed ERROR: test-cases-abc.t#B output changed
! !
Failed test-cases-abc.t#B: output changed Failed test-cases-abc.t#B: output changed
# Ran 1 tests, 0 skipped, 1 failed. # Ran 1 tests, 0 skipped, 1 failed.
python hash seed: * (glob) python hash seed: * (glob)
[1] [1]
Support running multiple test cases in the same file Support running multiple test cases in the same file
$ rt test-cases-abc.t#B test-cases-abc.t#C $ rt test-cases-abc.t#B test-cases-abc.t#C
--- $TESTTMP/anothertests/cases/test-cases-abc.t --- $TESTTMP/anothertests/cases/test-cases-abc.t
+++ $TESTTMP/anothertests/cases/test-cases-abc.t.B.err +++ $TESTTMP/anothertests/cases/test-cases-abc.t#B.err
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
$ V=C $ V=C
#endif #endif
$ echo $V | sed 's/A/C/' $ echo $V | sed 's/A/C/'
- C - C
+ B + B
#if C #if C
$ [ $V = C ] $ [ $V = C ]
#endif #endif
ERROR: test-cases-abc.t#B output changed ERROR: test-cases-abc.t#B output changed
!. !.
Failed test-cases-abc.t#B: output changed Failed test-cases-abc.t#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]
Support ignoring invalid test cases Support ignoring invalid test cases
$ rt test-cases-abc.t#B test-cases-abc.t#D $ rt test-cases-abc.t#B test-cases-abc.t#D
--- $TESTTMP/anothertests/cases/test-cases-abc.t --- $TESTTMP/anothertests/cases/test-cases-abc.t
+++ $TESTTMP/anothertests/cases/test-cases-abc.t.B.err +++ $TESTTMP/anothertests/cases/test-cases-abc.t#B.err
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
$ V=C $ V=C
#endif #endif
$ echo $V | sed 's/A/C/' $ echo $V | sed 's/A/C/'
- C - C
+ B + B
#if C #if C
$ [ $V = C ] $ [ $V = C ]
$ cat test-cases-advanced-cases.t $ cat test-cases-advanced-cases.t
#testcases simple case-with-dashes casewith_-.chars #testcases simple case-with-dashes casewith_-.chars
$ echo $TESTCASE $ echo $TESTCASE
simple simple
$ rt test-cases-advanced-cases.t $ rt test-cases-advanced-cases.t
--- $TESTTMP/anothertests/cases/test-cases-advanced-cases.t --- $TESTTMP/anothertests/cases/test-cases-advanced-cases.t
+++ $TESTTMP/anothertests/cases/test-cases-advanced-cases.t.case-with-dashes.err +++ $TESTTMP/anothertests/cases/test-cases-advanced-cases.t#case-with-dashes.err
@@ -1,3 +1,3 @@ @@ -1,3 +1,3 @@
#testcases simple case-with-dashes casewith_-.chars #testcases simple case-with-dashes casewith_-.chars
$ echo $TESTCASE $ echo $TESTCASE
- simple - simple
+ case-with-dashes + case-with-dashes
ERROR: test-cases-advanced-cases.t#case-with-dashes output changed ERROR: test-cases-advanced-cases.t#case-with-dashes output changed
! !
--- $TESTTMP/anothertests/cases/test-cases-advanced-cases.t --- $TESTTMP/anothertests/cases/test-cases-advanced-cases.t
+++ $TESTTMP/anothertests/cases/test-cases-advanced-cases.t.casewith_-.chars.err +++ $TESTTMP/anothertests/cases/test-cases-advanced-cases.t#casewith_-.chars.err
@@ -1,3 +1,3 @@ @@ -1,3 +1,3 @@
#testcases simple case-with-dashes casewith_-.chars #testcases simple case-with-dashes casewith_-.chars
$ echo $TESTCASE $ echo $TESTCASE
- simple - simple
+ casewith_-.chars + casewith_-.chars
ERROR: test-cases-advanced-cases.t#casewith_-.chars output changed ERROR: test-cases-advanced-cases.t#casewith_-.chars output changed
!. !.
Failed test-cases-advanced-cases.t#case-with-dashes: output changed Failed test-cases-advanced-cases.t#case-with-dashes: output changed
Failed test-cases-advanced-cases.t#casewith_-.chars: output changed Failed test-cases-advanced-cases.t#casewith_-.chars: output changed
# Ran 3 tests, 0 skipped, 2 failed. # Ran 3 tests, 0 skipped, 2 failed.
python hash seed: * (glob) python hash seed: * (glob)
[1] [1]
$ rt "test-cases-advanced-cases.t#case-with-dashes" $ rt "test-cases-advanced-cases.t#case-with-dashes"
--- $TESTTMP/anothertests/cases/test-cases-advanced-cases.t --- $TESTTMP/anothertests/cases/test-cases-advanced-cases.t
+++ $TESTTMP/anothertests/cases/test-cases-advanced-cases.t.case-with-dashes.err +++ $TESTTMP/anothertests/cases/test-cases-advanced-cases.t#case-with-dashes.err
@@ -1,3 +1,3 @@ @@ -1,3 +1,3 @@
#testcases simple case-with-dashes casewith_-.chars #testcases simple case-with-dashes casewith_-.chars
$ echo $TESTCASE $ echo $TESTCASE
- simple - simple
+ case-with-dashes + case-with-dashes
ERROR: test-cases-advanced-cases.t#case-with-dashes output changed ERROR: test-cases-advanced-cases.t#case-with-dashes output changed
! !
Failed test-cases-advanced-cases.t#case-with-dashes: output changed Failed test-cases-advanced-cases.t#case-with-dashes: output changed
# Ran 1 tests, 0 skipped, 1 failed. # Ran 1 tests, 0 skipped, 1 failed.
python hash seed: * (glob) python hash seed: * (glob)
[1] [1]
$ rt "test-cases-advanced-cases.t#casewith_-.chars" $ rt "test-cases-advanced-cases.t#casewith_-.chars"
--- $TESTTMP/anothertests/cases/test-cases-advanced-cases.t --- $TESTTMP/anothertests/cases/test-cases-advanced-cases.t
+++ $TESTTMP/anothertests/cases/test-cases-advanced-cases.t.casewith_-.chars.err +++ $TESTTMP/anothertests/cases/test-cases-advanced-cases.t#casewith_-.chars.err
@@ -1,3 +1,3 @@ @@ -1,3 +1,3 @@
#testcases simple case-with-dashes casewith_-.chars #testcases simple case-with-dashes casewith_-.chars
$ echo $TESTCASE $ echo $TESTCASE
- simple - simple
+ casewith_-.chars + casewith_-.chars
ERROR: test-cases-advanced-cases.t#casewith_-.chars output changed ERROR: test-cases-advanced-cases.t#casewith_-.chars output changed
! !