This is an archive of the discontinued Mercurial Phabricator instance.

Differential D114

run-tests: pass color option via test case object , not global var
ClosedPublic

Authored by martinvonz on Jul 17 2017, 8:05 PM.

Details

Reviewers
krbullock
Group Reviewers
hg-reviewers
Commits
rHG0982d900dccb: run-tests: pass color option via test case object , not global var
rHG81dbaa1c053b: run-tests: pass color option via test case object , not global var
Summary

At first I updated the color field of the 'options' object (from the
CLI parser), but then I decided to put it directly on the test case
object itself to avoid mutating the shared object (even though all
tests would have the same value).

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.Jul 17 2017, 8:05 PM
martinvonz updated this revision to Diff 252.Jul 18 2017, 12:13 PM
martinvonz edited the summary of this revision. (Show Details)Jul 18 2017, 12:58 PM
martinvonz retitled this revision from run-tests: pass color option via options object, not global var to run-tests: pass color option via test case object , not global var.
martinvonz updated this revision to Diff 257.
krbullock accepted this revision.Jul 18 2017, 3:19 PM
krbullock added a subscriber: krbullock.

Queued, thanks.

This revision is now accepted and ready to land.Jul 18 2017, 3:19 PM
Closed by commit rHG81dbaa1c053b: run-tests: pass color option via test case object , not global var (authored by martinvonz). · Explain WhyJul 18 2017, 3:26 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 283

tests/run-tests.py

self.ignored = [] self.ignored = []
self.times = [] self.times = []
self._firststarttime = None self._firststarttime = None
# Data stored for the benefit of generating xunit reports. # Data stored for the benefit of generating xunit reports.
self.successes = [] self.successes = []
self.faildata = {} self.faildata = {}
global with_color if options.color == 'auto':
if not self.stream.isatty(): # check if the terminal is capable self.color = with_color and self.stream.isatty()
with_color = False elif options.color == 'never':
self.color = False
if options.color != 'auto':
if options.color == 'never':
with_color = False
else: # 'always', for testing purposes else: # 'always', for testing purposes
if pygmentspresent: self.color = pygmentspresent
with_color = True
def addFailure(self, test, reason): def addFailure(self, test, reason):
self.failures.append((test, reason)) self.failures.append((test, reason))
if self._options.first: if self._options.first:
self.stop() self.stop()
else: else:
with iolock: with iolock:
servefail, lines = getdiff(expected, got, servefail, lines = getdiff(expected, got,
test.refpath, test.errpath) test.refpath, test.errpath)
if servefail: if servefail:
raise test.failureException( raise test.failureException(
'server failed to start (HGPORT=%s)' % test._startport) 'server failed to start (HGPORT=%s)' % test._startport)
else: else:
self.stream.write('\n') self.stream.write('\n')
for line in lines: for line in lines:
if with_color and pygmentspresent: if self.color and pygmentspresent:
line = pygments.highlight( line = pygments.highlight(
line, line,
lexers.DiffLexer(), lexers.DiffLexer(),
formatters.Terminal256Formatter()) formatters.Terminal256Formatter())
if PYTHON3: if PYTHON3:
self.stream.flush() self.stream.flush()
self.stream.buffer.write(line) self.stream.buffer.write(line)
self.stream.buffer.flush() self.stream.buffer.flush()