| hg-reviewers |
Add --bisect-repo flag which accepts a different repo to bisect.
3rd party extensions may reuse run-tests.py from core to run tests. Test
failure could be caused by either a core hg change or the 3rd party
extension code itself. Having a way to specify which repo to bisect is
useful.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | tests/run-tests.py (10 lines) | |||
| M | tests/test-run-tests.t (52 lines) |
| parser.add_option('--allow-slow-tests', action='store_true', | parser.add_option('--allow-slow-tests', action='store_true', | ||||
| help='allow extremely slow tests') | help='allow extremely slow tests') | ||||
| parser.add_option('--showchannels', action='store_true', | parser.add_option('--showchannels', action='store_true', | ||||
| help='show scheduling channels') | help='show scheduling channels') | ||||
| parser.add_option('--known-good-rev', type="string", | parser.add_option('--known-good-rev', type="string", | ||||
| metavar="known_good_rev", | metavar="known_good_rev", | ||||
| help=("Automatically bisect any failures using this " | help=("Automatically bisect any failures using this " | ||||
| "revision as a known-good revision.")) | "revision as a known-good revision.")) | ||||
| parser.add_option('--bisect-repo', type="string", | |||||
| metavar='bisect_repo', | |||||
| help=("Path of a repo to bisect. Use together with " | |||||
| "--known-good-rev")) | |||||
| for option, (envvar, default) in defaults.items(): | for option, (envvar, default) in defaults.items(): | ||||
| defaults[option] = type(default)(os.environ.get(envvar, default)) | defaults[option] = type(default)(os.environ.get(envvar, default)) | ||||
| parser.set_defaults(**defaults) | parser.set_defaults(**defaults) | ||||
| return parser | return parser | ||||
| def parseargs(args, parser): | def parseargs(args, parser): | ||||
| # chg shares installation location with hg | # chg shares installation location with hg | ||||
| parser.error('--chg does not work when --with-hg is specified ' | parser.error('--chg does not work when --with-hg is specified ' | ||||
| '(use --with-chg instead)') | '(use --with-chg instead)') | ||||
| if options.color == 'always' and not pygmentspresent: | if options.color == 'always' and not pygmentspresent: | ||||
| sys.stderr.write('warning: --color=always ignored because ' | sys.stderr.write('warning: --color=always ignored because ' | ||||
| 'pygments is not installed\n') | 'pygments is not installed\n') | ||||
| if options.bisect_repo and not options.known_good_rev: | |||||
| parser.error("--bisect-repo cannot be used without --known-good-rev") | |||||
| global useipv6 | global useipv6 | ||||
| if options.ipv6: | if options.ipv6: | ||||
| useipv6 = checksocketfamily('AF_INET6') | useipv6 = checksocketfamily('AF_INET6') | ||||
| else: | else: | ||||
| # only use IPv6 if IPv4 is unavailable and IPv6 is available | # only use IPv6 if IPv4 is unavailable and IPv6 is available | ||||
| useipv6 = ((not checksocketfamily('AF_INET')) | useipv6 = ((not checksocketfamily('AF_INET')) | ||||
| and checksocketfamily('AF_INET6')) | and checksocketfamily('AF_INET6')) | ||||
| 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'] | bisectcmd = ['hg', 'bisect'] | ||||
| bisectrepo = self._runner.options.bisect_repo | |||||
| if bisectrepo: | |||||
| bisectcmd.extend(['-R', os.path.abspath(bisectrepo)]) | |||||
| 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(bisectcmd + ['--reset']), | nooutput(bisectcmd + ['--reset']), | ||||
| nooutput(bisectcmd + ['--bad', '.']) | nooutput(bisectcmd + ['--bad', '.']) | ||||
| Failed test-bisect.t: output changed | Failed test-bisect.t: output changed | ||||
| test-bisect.t broken by 72cbf122d116 (bad) | test-bisect.t broken by 72cbf122d116 (bad) | ||||
| # Ran 1 tests, 0 skipped, 1 failed. | # Ran 1 tests, 0 skipped, 1 failed. | ||||
| python hash seed: * (glob) | python hash seed: * (glob) | ||||
| [1] | [1] | ||||
| $ cd .. | $ cd .. | ||||
| support bisecting a separate repo | |||||
| $ hg init bisect-dependent | |||||
| $ cd bisect-dependent | |||||
| $ cat > test-bisect-dependent.t <<EOF | |||||
| > $ tail -1 \$TESTDIR/../bisect/test-bisect.t | |||||
| > pass | |||||
| > EOF | |||||
| $ hg commit -Am dependent test-bisect-dependent.t | |||||
| $ rt --known-good-rev=0 test-bisect-dependent.t | |||||
| --- $TESTTMP/anothertests/bisect-dependent/test-bisect-dependent.t | |||||
| +++ $TESTTMP/anothertests/bisect-dependent/test-bisect-dependent.t.err | |||||
| @@ -1,2 +1,2 @@ | |||||
| $ tail -1 $TESTDIR/../bisect/test-bisect.t | |||||
| - pass | |||||
| + fail | |||||
| ERROR: test-bisect-dependent.t output changed | |||||
| ! | |||||
| Failed test-bisect-dependent.t: output changed | |||||
| Failed to identify failure point for test-bisect-dependent.t | |||||
| # Ran 1 tests, 0 skipped, 1 failed. | |||||
| python hash seed: * (glob) | |||||
| [1] | |||||
| $ rt --bisect-repo=../test-bisect test-bisect-dependent.t | |||||
| Usage: run-tests.py [options] [tests] | |||||
| run-tests.py: error: --bisect-repo cannot be used without --known-good-rev | |||||
| [2] | |||||
| $ rt --known-good-rev=0 --bisect-repo=../bisect test-bisect-dependent.t | |||||
| --- $TESTTMP/anothertests/bisect-dependent/test-bisect-dependent.t | |||||
| +++ $TESTTMP/anothertests/bisect-dependent/test-bisect-dependent.t.err | |||||
| @@ -1,2 +1,2 @@ | |||||
| $ tail -1 $TESTDIR/../bisect/test-bisect.t | |||||
| - pass | |||||
| + fail | |||||
| ERROR: test-bisect-dependent.t output changed | |||||
| ! | |||||
| Failed test-bisect-dependent.t: output changed | |||||
| test-bisect-dependent.t broken by 72cbf122d116 (bad) | |||||
| # Ran 1 tests, 0 skipped, 1 failed. | |||||
| python hash seed: * (glob) | |||||
| [1] | |||||
| $ cd .. | |||||
| Test a broken #if statement doesn't break run-tests threading. | Test a broken #if statement doesn't break run-tests threading. | ||||
| ============================================================== | ============================================================== | ||||
| $ mkdir broken | $ mkdir broken | ||||
| $ cd broken | $ cd broken | ||||
| $ cat > test-broken.t <<EOF | $ cat > test-broken.t <<EOF | ||||
| > true | > true | ||||
| > #if notarealhghavefeature | > #if notarealhghavefeature | ||||
| > $ false | > $ false | ||||