comparison tests/run-tests.py @ 13994:f31a5b7f5c07

run-tests: use a results dict

13993:174d0a113757

    for s, r in replacements:
        output = re.sub(s, r, output)
    return ret, splitnewlines(output)

def runone(options, test, skips, passes, fails, ignores):
    '''tristate output:
    None -> skipped
    True -> passed
    False -> failed'''

    testpath = os.path.join(TESTDIR, test)

    def skip(msg):
        if not options.verbose:
            skips.append((test, msg))
        else:
            print "\nSkipping %s: %s" % (testpath, msg)
        return None

    def fail(msg, ret):

                if test.endswith(".t"):
                    rename(test + ".err", test)
                else:
                    rename(test + ".err", test + ".out")
                return
        fails.append((test, msg))

    if (test.startswith("test-") and '~' not in test and
        ('.' not in test or test.endswith('.py') or
         test.endswith('.bat') or test.endswith('.t'))):
        if not os.path.exists(test):

        if filename is not None:
            skipped.append((test, "blacklisted (%s)" % filename))
            return None

    if options.retest and not os.path.exists(test + ".err"):
        ignores.append((test, "not retesting"))
        return None

    if options.keywords:
        fp = open(test)
        t = fp.read().lower() + test.lower()
        fp.close()
        for k in options.keywords.lower().split():
            if k in t:
                break
            else:
                ignores.append((test, "doesn't match keyword"))
                return None

    vlog("# Test", test)

    # create a fresh hgrc

    if options.timeout > 0:
        signal.alarm(0)

    mark = '.'
    if ret == 0:
        passes.append(test)

    skipped = (ret == SKIPPED_STATUS)

    # If we're not in --debug mode and reference output file exists,
    # check test output against it.

def runtests(options, tests):
    global DAEMON_PIDS, HGRCPATH
    DAEMON_PIDS = os.environ["DAEMON_PIDS"] = os.path.join(HGTMP, 'daemon.pids')
    HGRCPATH = os.environ["HGRCPATH"] = os.path.join(HGTMP, '.hgrc')

    try:
        if INST:
            installhg(options)
            _checkhglib("Testing")

                tests.pop(0)
            if not tests:
                print "running all tests"
                tests = orig

        passes = []
        skips = []
        fails = []
        ignores = []

        for test in tests:
            ret = runone(options, test, skips, passes, fails, ignores)
            if options.first and ret is not None and not ret:
                break

        if options.child:
            fp = os.fdopen(options.child, 'w')
            fp.write('%d\n%d\n%d\n' % (tested, skipped, failed))
            for s in skips:
                fp.write("%s %s\n" % s)
            for s in fails:
                fp.write("%s %s\n" % s)
            fp.close()
        else:
            print
            for s in skips:
                print "Skipped %s: %s" % s
            for s in fails:
                print "Failed %s: %s" % s
            _checkhglib("Tested")
            print "# Ran %d tests, %d skipped, %d failed." % (
                len(passes) + len(fails), len(skips) + len(ignores), len(fails))

        if options.anycoverage:
            outputcoverage(options)
    except KeyboardInterrupt:
        failed = True
        print "\ninterrupted!"

    if fails:
        sys.exit(1)

def main():
    (options, args) = parseargs()
    if not options.child:

13994:f31a5b7f5c07

    for s, r in replacements:
        output = re.sub(s, r, output)
    return ret, splitnewlines(output)

def runone(options, test, results):
    '''tristate output:
    None -> skipped
    True -> passed
    False -> failed'''

    testpath = os.path.join(TESTDIR, test)

    def skip(msg):
        if not options.verbose:
            results['s'].append((test, msg))
        else:
            print "\nSkipping %s: %s" % (testpath, msg)
        return None

    def fail(msg, ret):

                if test.endswith(".t"):
                    rename(test + ".err", test)
                else:
                    rename(test + ".err", test + ".out")
                return
        results['f'].append((test, msg))

    def success():
        results['p'].append(test)

    def ignore(msg):
        results['i'].append((test, msg))

    if (test.startswith("test-") and '~' not in test and
        ('.' not in test or test.endswith('.py') or
         test.endswith('.bat') or test.endswith('.t'))):
        if not os.path.exists(test):

        if filename is not None:
            skipped.append((test, "blacklisted (%s)" % filename))
            return None

    if options.retest and not os.path.exists(test + ".err"):
        ignore("not retesting")
        return None

    if options.keywords:
        fp = open(test)
        t = fp.read().lower() + test.lower()
        fp.close()
        for k in options.keywords.lower().split():
            if k in t:
                break
            else:
                ignore("doesn't match keyword")
                return None

    vlog("# Test", test)

    # create a fresh hgrc

    if options.timeout > 0:
        signal.alarm(0)

    mark = '.'
    if ret == 0:
        success()

    skipped = (ret == SKIPPED_STATUS)

    # If we're not in --debug mode and reference output file exists,
    # check test output against it.

def runtests(options, tests):
    global DAEMON_PIDS, HGRCPATH
    DAEMON_PIDS = os.environ["DAEMON_PIDS"] = os.path.join(HGTMP, 'daemon.pids')
    HGRCPATH = os.environ["HGRCPATH"] = os.path.join(HGTMP, '.hgrc')

    results = dict(p=[], f=[], s=[], i=[])

    try:
        if INST:
            installhg(options)
            _checkhglib("Testing")

                tests.pop(0)
            if not tests:
                print "running all tests"
                tests = orig

        for test in tests:
            ret = runone(options, test, results)
            if options.first and ret is not None and not ret:
                break

        failed = len(results['f'])
        tested = len(results['p']) + failed
        skipped = len(results['s'])
        ignored = len(results['i'])

        if options.child:
            fp = os.fdopen(options.child, 'w')
            fp.write('%d\n%d\n%d\n' % (tested, skipped, failed))
            for s in results['s']:
                fp.write("%s %s\n" % s)
            for s in results['f']:
                fp.write("%s %s\n" % s)
            fp.close()
        else:
            print
            for s in results['s']:
                print "Skipped %s: %s" % s
            for s in results['f']:
                print "Failed %s: %s" % s
            _checkhglib("Tested")
            print "# Ran %d tests, %d skipped, %d failed." % (
                tested, skipped + ignored, failed)

        if options.anycoverage:
            outputcoverage(options)
    except KeyboardInterrupt:
        failed = True
        print "\ninterrupted!"

    if failed:
        sys.exit(1)

def main():
    (options, args) = parseargs()
    if not options.child: