# HG changeset patch # User Christian Delahousse # Date 2015-11-18 02:01:21 # Node ID a8a5206585ec52e16e54245b68eaadfbeee6c338 # Parent c07a2fd3197018eff69a5d524fa3933696f277bf 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. 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 @@ Remove the directory, then try to replac $ 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 @@ full conversion $ 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)