Patchwork [STABLE] tests: register test-merge-combination.t as small but slow

login
register
mail settings
Submitter Pierre-Yves David
Date Sept. 7, 2019, 1:01 p.m.
Message ID <0552670ad381a377768b.1567861308@nodosa.octopoid.net>
Download mbox | patch
Permalink /patch/41541/
State Accepted
Headers show

Comments

Pierre-Yves David - Sept. 7, 2019, 1:01 p.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1567860678 -7200
#      Sat Sep 07 14:51:18 2019 +0200
# Branch stable
# Node ID 0552670ad381a377768b40ee8ddd3454f5a400d5
# Parent  b22a8dadc6f52fd3d8f45ac71e71fe2be381017b
# EXP-Topic run-tests-scheduling
# Available At https://bitbucket.org/octobus/mercurial-devel/
#              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 0552670ad381
tests: register test-merge-combination.t as small but slow

run-tests.py use file size as an heuristic for test run time. The new
`test-merge-combination.t` is a small file that do a lot of processing. As a
result it tend to be scheduled really late but delay the full test run by a lot.

On an example test run, the one-before-last test completed 279s after the start
of the run, while `test-merge-combination.t` finished 355s after it. A 76s
delay. This delay can be avoided since `test-merge-combination.t` only got started
175s after the start of the run.
Gregory Szorc - Sept. 7, 2019, 5:54 p.m.
On Sat, Sep 7, 2019 at 6:17 AM Pierre-Yves David <
pierre-yves.david@ens-lyon.org> wrote:

> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david@octobus.net>
> # Date 1567860678 -7200
> #      Sat Sep 07 14:51:18 2019 +0200
> # Branch stable
> # Node ID 0552670ad381a377768b40ee8ddd3454f5a400d5
> # Parent  b22a8dadc6f52fd3d8f45ac71e71fe2be381017b
> # EXP-Topic run-tests-scheduling
> # Available At https://bitbucket.org/octobus/mercurial-devel/
> #              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r
> 0552670ad381
> tests: register test-merge-combination.t as small but slow
>

Queued for stable.


>
> run-tests.py use file size as an heuristic for test run time. The new
> `test-merge-combination.t` is a small file that do a lot of processing. As
> a
> result it tend to be scheduled really late but delay the full test run by
> a lot.
>
> On an example test run, the one-before-last test completed 279s after the
> start
> of the run, while `test-merge-combination.t` finished 355s after it. A 76s
> delay. This delay can be avoided since `test-merge-combination.t` only got
> started
> 175s after the start of the run.
>
> diff --git a/tests/run-tests.py b/tests/run-tests.py
> --- a/tests/run-tests.py
> +++ b/tests/run-tests.py
> @@ -2513,6 +2513,7 @@ def sorttests(testdescs, previoustimes,
>                  b'check': 100,
>                  b'gendoc': 100,
>                  b'contrib-perf': 200,
> +                b'merge-combination': 100,
>                  }
>          perf = {}
>
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
>

Patch

diff --git a/tests/run-tests.py b/tests/run-tests.py
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -2513,6 +2513,7 @@  def sorttests(testdescs, previoustimes, 
                 b'check': 100,
                 b'gendoc': 100,
                 b'contrib-perf': 200,
+                b'merge-combination': 100,
                 }
         perf = {}