This is an archive of the discontinued Mercurial Phabricator instance.

Differential D118

run-tests: remove unnecessary 'with_color' variable
ClosedPublic

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

Details

Reviewers
krbullock
Group Reviewers
hg-reviewers
Commits
rHGa2c35146596b: run-tests: remove unnecessary 'with_color' variable
rHGda8bdeb1be28: run-tests: remove unnecessary 'with_color' variable
Summary

Its value is always the same as that of 'pygmentspresent'.

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
quark added a subscriber: quark.Jul 17 2017, 8:45 PM
quark added inline comments.
tests/run-tests.py
414–416

Seems like a wrong spellchecker?

martinvonz marked an inline comment as done.Jul 18 2017, 12:36 AM
martinvonz updated this revision to Diff 234.
martinvonz added inline comments.Jul 18 2017, 12:36 AM
tests/run-tests.py
414–416

Oops, thanks for spotting that. It was a rebase artifact.

martinvonz updated this revision to Diff 259.Jul 18 2017, 12:58 PM
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 rHGda8bdeb1be28: run-tests: remove unnecessary 'with_color' variable (authored by martinvonz). · Explain WhyJul 18 2017, 3:27 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 286

tests/run-tests.py

sys.setdefaultencoding("undefined") sys.setdefaultencoding("undefined")
except NameError: except NameError:
pass pass
origenviron = os.environ.copy() origenviron = os.environ.copy()
osenvironb = getattr(os, 'environb', os.environ) osenvironb = getattr(os, 'environb', os.environ)
processlock = threading.Lock() processlock = threading.Lock()
with_color = False
pygmentspresent = False pygmentspresent = False
# ANSI color is unsupported prior to Windows 10 # ANSI color is unsupported prior to Windows 10
if os.name != 'nt': if os.name != 'nt':
try: # is pygments installed try: # is pygments installed
import pygments import pygments
import pygments.lexers as lexers import pygments.lexers as lexers
import pygments.formatters as formatters import pygments.formatters as formatters
with_color = True
pygmentspresent = True pygmentspresent = True
except ImportError: except ImportError:
pass pass
if sys.version_info > (3, 5, 0): if sys.version_info > (3, 5, 0):
PYTHON3 = True PYTHON3 = True
xrange = range # we use xrange in one place, and we'd rather not use range xrange = range # we use xrange in one place, and we'd rather not use range
def _bytespath(p): def _bytespath(p):
if not (os.path.isfile(options.with_chg) and if not (os.path.isfile(options.with_chg) and
os.access(options.with_chg, os.X_OK)): os.access(options.with_chg, os.X_OK)):
parser.error('--with-chg must specify a chg executable') parser.error('--with-chg must specify a chg executable')
if options.chg and options.with_hg: if options.chg and options.with_hg:
# chg shares installation location with hg # chg shares installation location with hg
parser.error('--chg does not work when --with-hg is specified ' parser.error('--chg does not work when --with-hg is specified '
'(use --with-chg instead)') '(use --with-chg instead)')
if options.color == 'always' and not pygmentspresent: if options.color == 'always' and not pygmentspresent:
sys.stderr.write('warning: --color=always ignored because ' sys.stderr.write('warning: --color=always ignored because '
'pygments is not installed\n') 'pygments is not installed\n')
quarkUnsubmitted
Done

Seems like a wrong spellchecker?

quark: Seems like a wrong spellchecker?
martinvonzAuthorUnsubmitted
Not Done

Oops, thanks for spotting that. It was a rebase artifact.

martinvonz: Oops, thanks for spotting that. It was a rebase artifact.
global useipv6 global useipv6
if options.ipv6: if options.ipv6:
useipv6 = checksocketfamily('AF_INET6') useipv6 = checksocketfamily('AF_INET6')
else: else:
# only use IPv6 if IPv4 is unavailable and IPv6 is available # only use IPv6 if IPv4 is unavailable and IPv6 is available
useipv6 = ((not checksocketfamily('AF_INET')) useipv6 = ((not checksocketfamily('AF_INET'))
and checksocketfamily('AF_INET6')) and checksocketfamily('AF_INET6'))
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 = {}
if options.color == 'auto': if options.color == 'auto':
self.color = with_color and self.stream.isatty() self.color = pygmentspresent and self.stream.isatty()
elif options.color == 'never': elif options.color == 'never':
self.color = False self.color = False
else: # 'always', for testing purposes else: # 'always', for testing purposes
self.color = pygmentspresent self.color = pygmentspresent
def addFailure(self, test, reason): def addFailure(self, test, reason):
self.failures.append((test, reason)) self.failures.append((test, reason))