D4052: testrunner: use "#" for "test cases" suffix in .err filename too
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Thu Aug 2 05:39:05 UTC 2018
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This seems like a natural follow-up to https://phab.mercurial-scm.org/rHGb865bba56db1a6ee14d6249ac071d1ad36169ec9 (run-tests: update
the test case name format, 2018-05-13).
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D4052
AFFECTED FILES
tests/run-tests.py
tests/test-run-tests.t
CHANGE DETAILS
diff --git a/tests/test-run-tests.t b/tests/test-run-tests.t
--- a/tests/test-run-tests.t
+++ b/tests/test-run-tests.t
@@ -850,7 +850,7 @@
> EOF
--- $TESTTMP/test-cases.t
- +++ $TESTTMP/test-cases.t.a.err
+ +++ $TESTTMP/test-cases.t#a.err
@@ -1,6 +1,7 @@
#testcases a b
#if a
@@ -861,7 +861,7 @@
$ echo 2
Accept this change? [n] .
--- $TESTTMP/test-cases.t
- +++ $TESTTMP/test-cases.t.b.err
+ +++ $TESTTMP/test-cases.t#b.err
@@ -5,4 +5,5 @@
#endif
#if b
@@ -1540,7 +1540,7 @@
$ rt
.
--- $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 @@
$ V=C
#endif
@@ -1563,7 +1563,7 @@
$ rt --restart
--- $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 @@
$ V=C
#endif
@@ -1584,11 +1584,11 @@
--restart works with outputdir
$ mkdir output
- $ mv test-cases-abc.t.B.err output
+ $ mv test-cases-abc.t#B.err output
$ rt --restart --outputdir output
--- $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 @@
$ V=C
#endif
@@ -1631,7 +1631,7 @@
$ rt "test-cases-abc.t#B"
--- $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 @@
$ V=C
#endif
@@ -1654,7 +1654,7 @@
$ 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.B.err
+ +++ $TESTTMP/anothertests/cases/test-cases-abc.t#B.err
@@ -7,7 +7,7 @@
$ V=C
#endif
@@ -1677,7 +1677,7 @@
$ 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.B.err
+ +++ $TESTTMP/anothertests/cases/test-cases-abc.t#B.err
@@ -7,7 +7,7 @@
$ V=C
#endif
@@ -1711,7 +1711,7 @@
$ rt 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 @@
#testcases simple case-with-dashes casewith_-.chars
$ echo $TESTCASE
@@ -1721,7 +1721,7 @@
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.casewith_-.chars.err
+ +++ $TESTTMP/anothertests/cases/test-cases-advanced-cases.t#casewith_-.chars.err
@@ -1,3 +1,3 @@
#testcases simple case-with-dashes casewith_-.chars
$ echo $TESTCASE
@@ -1739,7 +1739,7 @@
$ 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.case-with-dashes.err
+ +++ $TESTTMP/anothertests/cases/test-cases-advanced-cases.t#case-with-dashes.err
@@ -1,3 +1,3 @@
#testcases simple case-with-dashes casewith_-.chars
$ echo $TESTCASE
@@ -1756,7 +1756,7 @@
$ rt "test-cases-advanced-cases.t#casewith_-.chars"
--- $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 @@
#testcases simple case-with-dashes casewith_-.chars
$ echo $TESTCASE
diff --git a/tests/run-tests.py b/tests/run-tests.py
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -1248,7 +1248,7 @@
super(TTest, self).__init__(path, *args, **kwds)
if 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._have = {}
@@ -2713,7 +2713,7 @@
desc = testdescs[0]
# desc['path'] is a relative path
if 'case' in desc:
- errpath = b'%s.%s.err' % (desc['path'], desc['case'])
+ errpath = b'%s#%s.err' % (desc['path'], desc['case'])
else:
errpath = b'%s.err' % desc['path']
errpath = os.path.join(self._outputdir, errpath)
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list