comparison tests/run-tests.py @ 34803:d817bf1fc675

run-tests: extract Popen logic to a single method

This removes 3 lines in total LOC and makes the upcoming changes easier.

Differential Revision: https://phab.mercurial-scm.org/D948

34802:9c7548eb7d1c

    def _bisecttests(self, tests):
        bisectcmd = ['hg', 'bisect']
        bisectrepo = self._runner.options.bisect_repo
        if bisectrepo:
            bisectcmd.extend(['-R', os.path.abspath(bisectrepo)])
        def nooutput(args):
            p = subprocess.Popen(args, stderr=subprocess.STDOUT,
                                 stdout=subprocess.PIPE)
            p.stdout.read()
            p.wait()
        for test in tests:
            nooutput(bisectcmd + ['--reset']),
            nooutput(bisectcmd + ['--bad', '.'])
            nooutput(bisectcmd + ['--good',
                      self._runner.options.known_good_rev])
            # TODO: we probably need to forward more options
            # that alter hg's behavior inside the tests.
            opts = ''
            withhg = self._runner.options.with_hg
            if withhg:
                opts += ' --with-hg=%s ' % shellquote(_strpath(withhg))
            rtc = '%s %s %s %s' % (sys.executable, sys.argv[0], opts,
                                   test)
            sub = subprocess.Popen(bisectcmd + ['--command', rtc],
                                   stderr=subprocess.STDOUT,
                                   stdout=subprocess.PIPE)
            data = sub.stdout.read()
            sub.wait()
            m = re.search(
                (br'\nThe first (?P<goodbad>bad|good) revision '
                 br'is:\nchangeset: +\d+:(?P<node>[a-f0-9]+)\n.*\n'
                 br'summary: +(?P<summary>[^\n]+)\n'),
                data, (re.MULTILINE | re.DOTALL))

34803:d817bf1fc675

    def _bisecttests(self, tests):
        bisectcmd = ['hg', 'bisect']
        bisectrepo = self._runner.options.bisect_repo
        if bisectrepo:
            bisectcmd.extend(['-R', os.path.abspath(bisectrepo)])
        def pread(args):
            p = subprocess.Popen(args, stderr=subprocess.STDOUT,
                                 stdout=subprocess.PIPE)
            data = p.stdout.read()
            p.wait()
            return data
        for test in tests:
            pread(bisectcmd + ['--reset']),
            pread(bisectcmd + ['--bad', '.'])
            pread(bisectcmd + ['--good', self._runner.options.known_good_rev])
            # TODO: we probably need to forward more options
            # that alter hg's behavior inside the tests.
            opts = ''
            withhg = self._runner.options.with_hg
            if withhg:
                opts += ' --with-hg=%s ' % shellquote(_strpath(withhg))
            rtc = '%s %s %s %s' % (sys.executable, sys.argv[0], opts,
                                   test)
            data = pread(bisectcmd + ['--command', rtc])
            m = re.search(
                (br'\nThe first (?P<goodbad>bad|good) revision '
                 br'is:\nchangeset: +\d+:(?P<node>[a-f0-9]+)\n.*\n'
                 br'summary: +(?P<summary>[^\n]+)\n'),
                data, (re.MULTILINE | re.DOTALL))