[PATCH 5 of 5] run-tests: make --restart work with output dir

Pierre-Yves David pierre-yves.david at ens-lyon.org
Thu Jun 8 09:25:58 EDT 2017


On 06/08/2017 05:26 AM, Siddharth Agarwal wrote:
> # HG changeset patch
> # User Siddharth Agarwal <sid0 at fb.com>
> # Date 1496895444 25200
> #      Wed Jun 07 21:17:24 2017 -0700
> # Node ID 7157ecbb2426689cd8f1133bf7dde2822d68b6a8
> # Parent  1403ca58e0bbd50a9a9287915073516db610b3c2
> run-tests: make --restart work with output dir

Series looks overall good to me, patch 3 forgot a glob, patch 5 as a 
small unrelated doc changes (and fixing patch 3 mistake)

> diff --git a/tests/run-tests.py b/tests/run-tests.py
> --- a/tests/run-tests.py
> +++ b/tests/run-tests.py
> @@ -2399,10 +2399,12 @@ class TestRunner(object):
>                  orig = list(testdescs)
>                  while testdescs:
>                      desc = testdescs[0]
> +                    # desc['path'] is a relative path

That seems like an unrelated (but welcome documentation update.

>                      if 'case' in desc:
>                          errpath = b'%s.%s.err' % (desc['path'], desc['case'])
>                      else:
>                          errpath = b'%s.err' % desc['path']
> +                    errpath = os.path.join(self._outputdir, errpath)
>                      if os.path.exists(errpath):
>                          break
>                      testdescs.pop(0)
> diff --git a/tests/test-run-tests.t b/tests/test-run-tests.t
> --- a/tests/test-run-tests.t
> +++ b/tests/test-run-tests.t
> @@ -858,7 +858,7 @@ test for --json
>    Skipped test-skip.t: missing feature: nail clipper
>    Failed test-failure.t: output changed
>    # Ran 2 tests, 1 skipped, 0 warned, 1 failed.
> -  python hash seed: 1138307315
> +  python hash seed: * (glob)

That change is harmless, It revert a lack of glob in patch 3.

Cheers

-- 
Pierre-Yves David


More information about the Mercurial-devel mailing list