Patchwork convert: changed test's progress output format to ignore estimate

login
register
mail settings
Submitter Christian Delahousse
Date Nov. 18, 2015, 2:14 a.m.
Message ID <34e9623d97568142dd75.1447812873@dev4253.prn1.facebook.com>
Download mbox | patch
Permalink /patch/11460/
State Accepted
Headers show

Comments

Christian Delahousse - Nov. 18, 2015, 2:14 a.m.
# HG changeset patch
# User Christian Delahousse <cdelahousse@fb.com>
# Date 1447812081 28800
#      Tue Nov 17 18:01:21 2015 -0800
# Node ID 34e9623d97568142dd75b1204b4211f3aa7c4be6
# Parent  eeef27919dc845f20f6abc477f50adbab2cb9760
convert: changed test's progress output format to ignore estimate

On my machine, whenever I run all test with a high -j value, test-convert-git.t
would consistently fail by displaying an estimate. This patch removes that value
from the output.
Pierre-Yves David - Nov. 18, 2015, 10:19 a.m.
On 11/17/2015 06:14 PM, cdelahousse@fb.com wrote:
> # HG changeset patch
> # User Christian Delahousse <cdelahousse@fb.com>
> # Date 1447812081 28800
> #      Tue Nov 17 18:01:21 2015 -0800
> # Node ID 34e9623d97568142dd75b1204b4211f3aa7c4be6
> # Parent  eeef27919dc845f20f6abc477f50adbab2cb9760
> convert: changed test's progress output format to ignore estimate
>
> On my machine, whenever I run all test with a high -j value, test-convert-git.t
> would consistently fail by displaying an estimate. This patch removes that value
> from the output.

Seems sane, pushed to the clowncopter.

Patch

diff --git a/tests/test-convert-git.t b/tests/test-convert-git.t
--- a/tests/test-convert-git.t
+++ b/tests/test-convert-git.t
@@ -54,7 +54,7 @@ 
   $ hg convert --config extensions.progress= --config progress.assume-tty=1 \
   >   --config progress.delay=0 --config progress.changedelay=0 \
   >   --config progress.refresh=0 --config progress.width=60 \
-  > --datesort git-repo
+  >   --config progress.format='topic, bar, number' --datesort git-repo
   \r (no-eol) (esc)
   scanning [======>                                     ] 1/6\r (no-eol) (esc)
   scanning [=============>                              ] 2/6\r (no-eol) (esc)
@@ -173,7 +173,8 @@ 
   $ hg convert --datesort git-repo2 fullrepo \
   > --config extensions.progress= --config progress.assume-tty=1 \
   > --config progress.delay=0 --config progress.changedelay=0 \
-  > --config progress.refresh=0 --config progress.width=60
+  > --config progress.refresh=0 --config progress.width=60 \
+  > --config progress.format='topic, bar, number'
   \r (no-eol) (esc)
   scanning [===>                                        ] 1/9\r (no-eol) (esc)
   scanning [========>                                   ] 2/9\r (no-eol) (esc)