This is an archive of the discontinued Mercurial Phabricator instance.

Differential D948

run-tests: extract Popen logic to a single method
ClosedPublic

Authored by quark on Oct 5 2017, 12:22 AM.

Details

Reviewers
ryanmce
Group Reviewers
hg-reviewers
Commits
rHGd817bf1fc675: run-tests: extract Popen logic to a single method
Summary

This removes 3 lines in total LOC and makes the upcoming changes easier.

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

quark created this revision.Oct 5 2017, 12:22 AM
dlax added a subscriber: dlax.Oct 5 2017, 3:24 AM
dlax added inline comments.
tests/run-tests.py
2113–2115

Perhaps also update the indentation of continuation line?

ryanmce added a subscriber: ryanmce.Oct 12 2017, 7:29 AM
ryanmce added inline comments.
tests/run-tests.py
2113–2115

I can do this in-flight

ryanmce requested changes to this revision.Oct 12 2017, 7:35 AM
This revision now requires changes to proceed.Oct 12 2017, 7:35 AM
ryanmce added inline comments.Oct 12 2017, 7:36 AM
tests/run-tests.py
2113–2115

Actually, since I've asked for changed on the topmost revision, can you fix this up with the next submission please?

quark updated this revision to Diff 2889.Oct 17 2017, 12:45 AM
ryanmce accepted this revision.Oct 17 2017, 8:09 AM

queued

This revision is now accepted and ready to land.Oct 17 2017, 8:09 AM
Closed by commit rHGd817bf1fc675: run-tests: extract Popen logic to a single method (authored by quark). · Explain WhyOct 17 2017, 8:10 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/run-tests.py (18 lines)

Diff 2900

tests/run-tests.py

return result return result
def _bisecttests(self, tests): def _bisecttests(self, tests):
bisectcmd = ['hg', 'bisect'] bisectcmd = ['hg', 'bisect']
bisectrepo = self._runner.options.bisect_repo bisectrepo = self._runner.options.bisect_repo
if bisectrepo: if bisectrepo:
bisectcmd.extend(['-R', os.path.abspath(bisectrepo)]) bisectcmd.extend(['-R', os.path.abspath(bisectrepo)])
def nooutput(args): def pread(args):
p = subprocess.Popen(args, stderr=subprocess.STDOUT, p = subprocess.Popen(args, stderr=subprocess.STDOUT,
stdout=subprocess.PIPE) stdout=subprocess.PIPE)
p.stdout.read() data = p.stdout.read()
p.wait() p.wait()
return data
for test in tests: for test in tests:
nooutput(bisectcmd + ['--reset']), pread(bisectcmd + ['--reset']),
nooutput(bisectcmd + ['--bad', '.']) pread(bisectcmd + ['--bad', '.'])
nooutput(bisectcmd + ['--good', pread(bisectcmd + ['--good', self._runner.options.known_good_rev])
dlaxUnsubmitted
Not Done

Perhaps also update the indentation of continuation line?

dlax: Perhaps also update the indentation of continuation line?
ryanmceUnsubmitted
Not Done

I can do this in-flight

ryanmce: I can do this in-flight
ryanmceUnsubmitted
Not Done

Actually, since I've asked for changed on the topmost revision, can you fix this up with the next submission please?

ryanmce: Actually, since I've asked for changed on the topmost revision, can you fix this up with the…
self._runner.options.known_good_rev])
# TODO: we probably need to forward more options # TODO: we probably need to forward more options
# that alter hg's behavior inside the tests. # that alter hg's behavior inside the tests.
opts = '' opts = ''
withhg = self._runner.options.with_hg withhg = self._runner.options.with_hg
if withhg: if withhg:
opts += ' --with-hg=%s ' % shellquote(_strpath(withhg)) opts += ' --with-hg=%s ' % shellquote(_strpath(withhg))
rtc = '%s %s %s %s' % (sys.executable, sys.argv[0], opts, rtc = '%s %s %s %s' % (sys.executable, sys.argv[0], opts,
test) test)
sub = subprocess.Popen(bisectcmd + ['--command', rtc], data = pread(bisectcmd + ['--command', rtc])
stderr=subprocess.STDOUT,
stdout=subprocess.PIPE)
data = sub.stdout.read()
sub.wait()
m = re.search( m = re.search(
(br'\nThe first (?P<goodbad>bad|good) revision ' (br'\nThe first (?P<goodbad>bad|good) revision '
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)