comparison tests/run-tests.py @ 21438:f647287b44d1

run-tests: pass an optional TestResult into _executetests()

If the result is passed, we execute tests in the unittest way. A
subsequent patch will actually do this.

21437:d9532be2fc4d

            '.': [],
            '!': [],
            '~': [],
            's': [],
            'i': [],
        }
        self.abort = [False]
        self._createdfiles = []
        self._hgpath = None

            adir = os.path.join(self.testdir, 'annotated')
            if not os.path.isdir(adir):
                os.mkdir(adir)
            covrun('-i', '-a', '"--directory=%s"' % adir, '"--omit=%s"' % omit)

    def _executetests(self, tests):
        jobs = self.options.jobs
        done = queue.Queue()
        running = 0

        def job(test):
            try:
                done.put(test.run())
                test.cleanup()
            except KeyboardInterrupt:
                pass
            except: # re-raises
                done.put(('!', test, 'run-test raised an error, see traceback'))

                if tests and not running == jobs:
                    test = tests.pop(0)
                    if self.options.loop:
                        tests.append(test)
                    t = threading.Thread(target=job, name=test.name,
                                         args=[test])
                    t.start()
                    running += 1
        except KeyboardInterrupt:
            self.abort[0] = True

21438:f647287b44d1

            '.': [],
            '!': [],
            '~': [],
            's': [],
            'i': [],
            'u': [],
        }
        self.abort = [False]
        self._createdfiles = []
        self._hgpath = None

            adir = os.path.join(self.testdir, 'annotated')
            if not os.path.isdir(adir):
                os.mkdir(adir)
            covrun('-i', '-a', '"--directory=%s"' % adir, '"--omit=%s"' % omit)

    def _executetests(self, tests, result=None):
        # We copy because we modify the list.
        tests = list(tests)

        jobs = self.options.jobs
        done = queue.Queue()
        running = 0

        def job(test, result):
            try:
                # If in unittest mode.
                if result:
                    test(result)
                    # We need to put something here to make the logic happy.
                    # This will get cleaned up later.
                    done.put(('u', None, None))
                else:
                    done.put(test.run())
                test.cleanup()
            except KeyboardInterrupt:
                pass
            except: # re-raises
                done.put(('!', test, 'run-test raised an error, see traceback'))

                if tests and not running == jobs:
                    test = tests.pop(0)
                    if self.options.loop:
                        tests.append(test)
                    t = threading.Thread(target=job, name=test.name,
                                         args=(test, result))
                    t.start()
                    running += 1
        except KeyboardInterrupt:
            self.abort[0] = True