| hg-reviewers |
This does not change any logic.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| with open(jsonpath, 'w') as fp: | with open(jsonpath, 'w') as fp: | ||||
| self._writejson(result, fp) | self._writejson(result, fp) | ||||
| self._runner._checkhglib('Tested') | self._runner._checkhglib('Tested') | ||||
| savetimes(self._runner._outputdir, result) | savetimes(self._runner._outputdir, result) | ||||
| if failed and self._runner.options.known_good_rev: | if failed and self._runner.options.known_good_rev: | ||||
| bisectcmd = ['hg', 'bisect'] | |||||
| def nooutput(args): | def nooutput(args): | ||||
| p = subprocess.Popen(args, stderr=subprocess.STDOUT, | p = subprocess.Popen(args, stderr=subprocess.STDOUT, | ||||
| stdout=subprocess.PIPE) | stdout=subprocess.PIPE) | ||||
| p.stdout.read() | p.stdout.read() | ||||
| p.wait() | p.wait() | ||||
| for test, msg in result.failures: | for test, msg in result.failures: | ||||
| nooutput(['hg', 'bisect', '--reset']), | nooutput(bisectcmd + ['--reset']), | ||||
| nooutput(['hg', 'bisect', '--bad', '.']) | nooutput(bisectcmd + ['--bad', '.']) | ||||
| nooutput(['hg', 'bisect', '--good', | nooutput(bisectcmd + ['--good', | ||||
| self._runner.options.known_good_rev]) | self._runner.options.known_good_rev]) | ||||
| # TODO: we probably need to forward more options | # TODO: we probably need to forward more options | ||||
| # that alter hg's behavior inside the tests. | # that alter hg's behavior inside the tests. | ||||
| opts = '' | opts = '' | ||||
| withhg = self._runner.options.with_hg | withhg = self._runner.options.with_hg | ||||
| if withhg: | if withhg: | ||||
| opts += ' --with-hg=%s ' % shellquote(withhg) | opts += ' --with-hg=%s ' % shellquote(withhg) | ||||
| rtc = '%s %s %s %s' % (sys.executable, sys.argv[0], opts, | rtc = '%s %s %s %s' % (sys.executable, sys.argv[0], opts, | ||||
| test) | test) | ||||
| sub = subprocess.Popen(['hg', 'bisect', '--command', rtc], | sub = subprocess.Popen(bisectcmd + ['--command', rtc], | ||||
| stderr=subprocess.STDOUT, | stderr=subprocess.STDOUT, | ||||
| stdout=subprocess.PIPE) | stdout=subprocess.PIPE) | ||||
| data = sub.stdout.read() | data = sub.stdout.read() | ||||
| sub.wait() | sub.wait() | ||||
| m = re.search( | m = re.search( | ||||
| (r'\nThe first (?P<goodbad>bad|good) revision ' | (r'\nThe first (?P<goodbad>bad|good) revision ' | ||||
| r'is:\nchangeset: +\d+:(?P<node>[a-f0-9]+)\n.*\n' | r'is:\nchangeset: +\d+:(?P<node>[a-f0-9]+)\n.*\n' | ||||
| r'summary: +(?P<summary>[^\n]+)\n'), | r'summary: +(?P<summary>[^\n]+)\n'), | ||||