Patchwork [STABLE] test: further fixes to matching for run-tests.py bug

login
register
mail settings
Submitter Pierre-Yves David
Date Aug. 9, 2019, 12:34 p.m.
Message ID <76ab667807dbcfbe5de1.1565354085@nodosa.octopoid.net>
Download mbox | patch
Permalink /patch/41236/
State Accepted
Headers show

Comments

Pierre-Yves David - Aug. 9, 2019, 12:34 p.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1565349087 -7200
#      Fri Aug 09 13:11:27 2019 +0200
# Branch stable
# Node ID 76ab667807dbcfbe5de10b1cb527e4ca5a58ab0f
# Parent  978c9a0c5974a6049c639b4b2c712978af034455
# EXP-Topic fix-runtests-further
# Available At https://bitbucket.org/octobus/mercurial-devel/
#              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 76ab667807db
test: further fixes to matching for run-tests.py bug

The fix in bac24a8a095a did not fix the full issue, because the extra number
also eat some of the separator space. Since we are already matching arbitrary
number of space, we easily fix the matching.
Augie Fackler - Aug. 9, 2019, 12:46 p.m.
> On Aug 9, 2019, at 14:34, Pierre-Yves David <pierre-yves.david@ens-lyon.org> wrote:
> 
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david@octobus.net>
> # Date 1565349087 -7200
> #      Fri Aug 09 13:11:27 2019 +0200
> # Branch stable
> # Node ID 76ab667807dbcfbe5de10b1cb527e4ca5a58ab0f
> # Parent  978c9a0c5974a6049c639b4b2c712978af034455
> # EXP-Topic fix-runtests-further
> # Available At https://bitbucket.org/octobus/mercurial-devel/
> #              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 76ab667807db
> test: further fixes to matching for run-tests.py bug

queued for stable, thanks

Patch

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
@@ -1030,7 +1030,7 @@  test for --time
   # Ran 1 tests, 0 skipped, 0 failed.
   # Producing time report
   start   end     cuser   csys    real      Test
-  \s*[\d\.]{5,8}   \s*[\d\.]{5,8}   \s*[\d\.]{5,8}   \s*[\d\.]{5,8}   \s*[\d\.]{5,8}   test-success.t (re)
+  \s*[\d\.]{5,8} \s*[\d\.]{5,8} \s*[\d\.]{5,8} \s*[\d\.]{5,8} \s*[\d\.]{5,8}   test-success.t (re)
 
 test for --time with --job enabled
 ====================================
@@ -1041,7 +1041,7 @@  test for --time with --job enabled
   # Ran 1 tests, 0 skipped, 0 failed.
   # Producing time report
   start   end     cuser   csys    real      Test
-  \s*[\d\.]{5,8}   \s*[\d\.]{5,8}   \s*[\d\.]{5,8}   \s*[\d\.]{5,8}   \s*[\d\.]{5,8}   test-success.t (re)
+  \s*[\d\.]{5,8} \s*[\d\.]{5,8} \s*[\d\.]{5,8} \s*[\d\.]{5,8} \s*[\d\.]{5,8}   test-success.t (re)
 
 Skips
 ================