view tests/basic_test_result.py @ 40369:ef6cab7930b3

py3: fix module imports in tests, as flagged by test-check-module-imports.t

I have no idea why these aren't flagged with python2.  I excluded
test-highlight.t for now to make this easier to review- the changed code is
committed to a repo, which has cascading changes on the rest of the test.

There's a mix of bytes and str in the imports dict of contrib/import-checker.py
that crashed it half way through listing out these errors.  I couldn't figure
out how to fix that properly, so I was lazy and applied this on py3, to find the
rest of the errors:

    diff --git a/contrib/import-checker.py b/contrib/import-checker.py
    --- a/contrib/import-checker.py
    +++ b/contrib/import-checker.py
    @@ -626,7 +626,12 @@ def find_cycles(imports):
         top.foo -> top.qux -> top.foo
         """
         cycles = set()
    -    for mod in sorted(imports.keys()):
    +    def sort(v):
    +        if isinstance(v, bytes):
    +            return v.decode('ascii')
    +        return v
    +
    +    for mod in sorted(imports.keys(), key=sort):
             try:
                 checkmod(mod, imports)
             except CircularImport as e:

from __future__ import absolute_import, print_function

import unittest

class TestResult(unittest._TextTestResult):

    def __init__(self, options, *args, **kwargs):
        super(TestResult, self).__init__(*args, **kwargs)
        self._options = options

        # unittest.TestResult didn't have skipped until 2.7. We need to
        # polyfill it.
        self.skipped = []

        # We have a custom "ignored" result that isn't present in any Python
        # unittest implementation. It is very similar to skipped. It may make
        # sense to map it into skip some day.
        self.ignored = []

        self.times = []
        self._firststarttime = None
        # Data stored for the benefit of generating xunit reports.
        self.successes = []
        self.faildata = {}

    def addFailure(self, test, reason):
        print("FAILURE!", test, reason)

    def addSuccess(self, test):
        print("SUCCESS!", test)

    def addError(self, test, err):
        print("ERR!", test, err)

    # Polyfill.
    def addSkip(self, test, reason):
        print("SKIP!", test, reason)

    def addIgnore(self, test, reason):
        print("IGNORE!", test, reason)

    def onStart(self, test):
        print("ON_START!", test)

    def onEnd(self):
        print("ON_END!")

    def addOutputMismatch(self, test, ret, got, expected):
        return False

    def stopTest(self, test, interrupted=False):
        super(TestResult, self).stopTest(test)