This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5557

testrunner: make `-j100 --runs-per-test=100 test-foo.t` use 100 jobs
ClosedPublic

Authored by martinvonz on Jan 10 2019, 5:33 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG53327bfbf35d: testrunner: make `-j100 --runs-per-test=100 test-foo.t` use 100 jobs
Summary

It would use only 1 job since 1039404c5e1d (run-tests: print number of
tests and parallel process count, 2018-10-13), but I'm pretty sure
that was unintentional.

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 10 2019, 5:33 PM
martinvonz added a comment.Jan 10 2019, 5:36 PM

Could you please include a test case?

martinvonz updated this revision to Diff 13152.Jan 10 2019, 5:42 PM
martinvonz added a comment.Jan 10 2019, 5:43 PM
In D5557#82106, @martinvonz wrote:

Could you please include a test case?

Done. Also made it print the number of test runs, not number of distinct tests.

Closed by commit rHG53327bfbf35d: testrunner: make `-j100 --runs-per-test=100 test-foo.t` use 100 jobs (authored by martinvonz). · Explain WhyJan 10 2019, 7:06 PM
This revision was automatically updated to reflect the committed changes.
indygreg added a subscriber: indygreg.Jan 10 2019, 7:24 PM

For the record, I enjoyed @martinvonz conversing with himself on this review!

Revision Contents
Changeset List

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

Diff 13153

tests/run-tests.py

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")
testdescs = orig testdescs = orig
tests = [self._gettest(d, i) for i, d in enumerate(testdescs)] tests = [self._gettest(d, i) for i, d in enumerate(testdescs)]
num_tests = len(tests) * self.options.runs_per_test
jobs = min(len(tests), self.options.jobs) jobs = min(num_tests, self.options.jobs)
failed = False failed = False
kws = self.options.keywords kws = self.options.keywords
if kws is not None and PYTHON3: if kws is not None and PYTHON3:
kws = kws.encode('utf-8') kws = kws.encode('utf-8')
suite = TestSuite(self._testdir, suite = TestSuite(self._testdir,
jobs=jobs, jobs=jobs,
self._checkhglib("Testing") self._checkhglib("Testing")
else: else:
self._usecorrectpython() self._usecorrectpython()
if self.options.chg: if self.options.chg:
assert self._installdir assert self._installdir
self._installchg() self._installchg()
log('running %d tests using %d parallel processes' % ( log('running %d tests using %d parallel processes' % (
len(tests), jobs)) num_tests, jobs))
result = runner.run(suite) result = runner.run(suite)
if result.failures: if result.failures:
failed = True failed = True
result.onEnd() result.onEnd()

tests/test-run-tests.t

# Ran 2 tests, 0 skipped, 2 failed. # Ran 2 tests, 0 skipped, 2 failed.
python hash seed: * (glob) python hash seed: * (glob)
[1] [1]
(delete the duplicated test file) (delete the duplicated test file)
$ rm test-failure-copy.t $ rm test-failure-copy.t
multiple runs per test should be parallelized
$ rt --jobs 2 --runs-per-test 2 test-success.t
running 2 tests using 2 parallel processes
..
# Ran 2 tests, 0 skipped, 0 failed.
Interactive run Interactive run
=============== ===============
(backup the failing test) (backup the failing test)
$ cp test-failure.t backup $ cp test-failure.t backup
Refuse the fix Refuse the fix