comparison tests/run-tests.py @ 33552:754569f5e999

run-tests: make sure to check if pygments is installed before using it

e80041832e introduced support to color the output of tests but used pygments
without checking whether it's installed or not. That breaks test-run-tests.t for
machines which don't have pygments installed. This patch conditionalize the
color test in test-run-tests.t and also add a check to make sure pygments is
installed before using that.

33551:1d1779734c99

origenviron = os.environ.copy()
osenvironb = getattr(os, 'environb', os.environ)
processlock = threading.Lock()

with_color = False

# ANSI color is unsupported prior to Windows 10
if os.name != 'nt':
    try: # is pygments installed
        import pygments
        import pygments.lexers as lexers
        import pygments.formatters as formatters
        with_color = True
    except ImportError:
        pass

if not sys.stderr.isatty(): # check if the terminal is capable
    with_color = False

                    raise test.failureException(
                        'server failed to start (HGPORT=%s)' % test._startport)
                else:
                    self.stream.write('\n')
                    for line in lines:
                        if with_color:
                            line = pygments.highlight(
                                    line,
                                    lexers.DiffLexer(),
                                    formatters.Terminal256Formatter())
                        if PYTHON3:

33552:754569f5e999

origenviron = os.environ.copy()
osenvironb = getattr(os, 'environb', os.environ)
processlock = threading.Lock()

with_color = False
pygmentspresent = False
# ANSI color is unsupported prior to Windows 10
if os.name != 'nt':
    try: # is pygments installed
        import pygments
        import pygments.lexers as lexers
        import pygments.formatters as formatters
        with_color = True
        pygmentspresent = True
    except ImportError:
        pass

if not sys.stderr.isatty(): # check if the terminal is capable
    with_color = False

                    raise test.failureException(
                        'server failed to start (HGPORT=%s)' % test._startport)
                else:
                    self.stream.write('\n')
                    for line in lines:
                        if with_color and pygmentspresent:
                            line = pygments.highlight(
                                    line,
                                    lexers.DiffLexer(),
                                    formatters.Terminal256Formatter())
                        if PYTHON3: