comparison tests/run-tests.py @ 27880:b04df9ce1fb0

run-tests: skip threading for a single test (issue5040)

This version backs out 50e621fe0362 and implements it in
a more consistent manner.

27879:52a4ad62b006

        jobs specifies the number of jobs to run concurrently. Each test
        executes on its own thread. Tests actually spawn new processes, so
        state mutation should not be an issue.

        whitelist and blacklist denote tests that have been whitelisted and
        blacklisted, respectively. These arguments don't belong in TestSuite.
        Instead, whitelist and blacklist should be handled by the thing that
        populates the TestSuite with tests. They are present to preserve
        backwards compatible behavior which reports skipped tests as part

        if self._showchannels:
            statthread = threading.Thread(target=stat, name="stat")
            statthread.start()

        try:
            if len(tests) == 1:
                test = tests.pop(0)
                test.run(result)
            else:
                while tests or running:
                    if not done.empty() or running == self._jobs or not tests:
                        try:
                            done.get(True, 1)
                            running -= 1
                            if result and result.shouldStop:
                                stoppedearly = True
                                break
                        except queue.Empty:
                            continue
                    if tests and not running == self._jobs:
                        test = tests.pop(0)
                        if self._loop:
                            if getattr(test, 'should_reload', False):
                                num_tests[0] += 1
                                tests.append(
                                    self._loadtest(test.name, num_tests[0]))
                            else:
                                tests.append(test)
                        t = threading.Thread(target=job, name=test.name,
                                             args=(test, result))
                        t.start()
                        running += 1

                # If we stop early we still need to wait on started tests to
                # finish. Otherwise, there is a race between the test completing
                # and the test's cleanup code running. This could result in the
                # test reporting incorrect.
                if stoppedearly:
                    while running:
                        try:
                            done.get(True, 1)
                            running -= 1
                        except queue.Empty:
                            continue
        except KeyboardInterrupt:
            for test in runtests:
                test.abort()

        channels = []

27880:b04df9ce1fb0

        jobs specifies the number of jobs to run concurrently. Each test
        executes on its own thread. Tests actually spawn new processes, so
        state mutation should not be an issue.

        If there is only one job, it will use the main thread.

        whitelist and blacklist denote tests that have been whitelisted and
        blacklisted, respectively. These arguments don't belong in TestSuite.
        Instead, whitelist and blacklist should be handled by the thing that
        populates the TestSuite with tests. They are present to preserve
        backwards compatible behavior which reports skipped tests as part

        if self._showchannels:
            statthread = threading.Thread(target=stat, name="stat")
            statthread.start()

        try:
            while tests or running:
                if not done.empty() or running == self._jobs or not tests:
                    try:
                        done.get(True, 1)
                        running -= 1
                        if result and result.shouldStop:
                            stoppedearly = True
                            break
                    except queue.Empty:
                        continue
                if tests and not running == self._jobs:
                    test = tests.pop(0)
                    if self._loop:
                        if getattr(test, 'should_reload', False):
                            num_tests[0] += 1
                            tests.append(
                                self._loadtest(test.name, num_tests[0]))
                        else:
                            tests.append(test)
                    if self._jobs == 1:
                        job(test, result)
                    else:
                        t = threading.Thread(target=job, name=test.name,
                                             args=(test, result))
                        t.start()
                    running += 1

            # If we stop early we still need to wait on started tests to
            # finish. Otherwise, there is a race between the test completing
            # and the test's cleanup code running. This could result in the
            # test reporting incorrect.
            if stoppedearly:
                while running:
                    try:
                        done.get(True, 1)
                        running -= 1
                    except queue.Empty:
                        continue
        except KeyboardInterrupt:
            for test in runtests:
                test.abort()

        channels = []