This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3350

tests: fix up a couple of minor bytes inconsistencies in run-tests.py
ClosedPublic

Authored by durin42 on Apr 14 2018, 12:32 AM.

Details

Reviewers
pulkit
indygreg
Group Reviewers
hg-reviewers
Commits
rHG700aaa19de63: tests: fix up a couple of minor bytes inconsistencies in run-tests.py
Summary

Only in the automatic bisection code, so fortunately nothing major is
amiss. Fixes test-run-tests.t under Python 3.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.Apr 14 2018, 12:32 AM
durin42 updated this revision to Diff 8269.Apr 14 2018, 10:41 AM
durin42 updated this revision to Diff 8313.Apr 16 2018, 4:17 PM
indygreg accepted this revision.Apr 16 2018, 7:13 PM
This revision is now accepted and ready to land.Apr 16 2018, 7:13 PM
Closed by commit rHG700aaa19de63: tests: fix up a couple of minor bytes inconsistencies in run-tests.py (authored by durin42). · Explain WhyApr 16 2018, 7:21 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/python3-whitelist (1 line)
Mtests/run-tests.py (5 lines)

Diff 8313

contrib/python3-whitelist

test-revlog-ancestry.py test-revlog-ancestry.py
test-revlog-group-emptyiter.t test-revlog-group-emptyiter.t
test-revlog-mmapindex.t test-revlog-mmapindex.t
test-revlog-packentry.t test-revlog-packentry.t
test-revset-dirstate-parents.t test-revset-dirstate-parents.t
test-revset-outgoing.t test-revset-outgoing.t
test-rollback.t test-rollback.t
test-run-tests.py test-run-tests.py
test-run-tests.t
test-schemes.t test-schemes.t
test-serve.t test-serve.t
test-setdiscovery.t test-setdiscovery.t
test-share.t test-share.t
test-show-stack.t test-show-stack.t
test-show-work.t test-show-work.t
test-show.t test-show.t
test-simple-update.t test-simple-update.t

tests/run-tests.py

br'is:\nchangeset: +\d+:(?P<node>[a-f0-9]+)\n.*\n' br'is:\nchangeset: +\d+:(?P<node>[a-f0-9]+)\n.*\n'
br'summary: +(?P<summary>[^\n]+)\n'), br'summary: +(?P<summary>[^\n]+)\n'),
data, (re.MULTILINE | re.DOTALL)) data, (re.MULTILINE | re.DOTALL))
if m is None: if m is None:
self.stream.writeln( self.stream.writeln(
'Failed to identify failure point for %s' % test) 'Failed to identify failure point for %s' % test)
continue continue
dat = m.groupdict() dat = m.groupdict()
verb = 'broken' if dat['goodbad'] == 'bad' else 'fixed' verb = 'broken' if dat['goodbad'] == b'bad' else 'fixed'
self.stream.writeln( self.stream.writeln(
'%s %s by %s (%s)' % ( '%s %s by %s (%s)' % (
test, verb, dat['node'], dat['summary'])) test, verb, dat['node'].decode('ascii'),
dat['summary'].decode('utf8', 'ignore')))
def printtimes(self, times): def printtimes(self, times):
# iolock held by run # iolock held by run
self.stream.writeln('# Producing time report') self.stream.writeln('# Producing time report')
times.sort(key=lambda t: (t[3])) times.sort(key=lambda t: (t[3]))
cols = '%7.3f %7.3f %7.3f %7.3f %7.3f %s' cols = '%7.3f %7.3f %7.3f %7.3f %7.3f %s'
self.stream.writeln('%-7s %-7s %-7s %-7s %-7s %s' % self.stream.writeln('%-7s %-7s %-7s %-7s %-7s %s' %
('start', 'end', 'cuser', 'csys', 'real', 'Test')) ('start', 'end', 'cuser', 'csys', 'real', 'Test'))