# HG changeset patch # User Pierre-Yves David # Date 2010-03-22 21:19:40 # Node ID bdb60057f9051ce45c43504dcd06fb29c3222dc6 # Parent 9f6e30a89f1112b07501e23dab272d41f0cf57b6 test-convert-cvs: filter unstable cvs output. The order choosen by cvs to display commit is not stable when the tests are run under heavy CPU/IO load. This leads to irrelevant failures of the test suite. This changeset filters four lines impacted by this instability. The result of the conversion is still verified. diff --git a/tests/test-convert-cvs b/tests/test-convert-cvs --- a/tests/test-convert-cvs +++ b/tests/test-convert-cvs @@ -80,7 +80,8 @@ cvscall -q -d "$CVSROOT" checkout -d src ls srcfull hg convert srcfull srcfull-hg \ | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g' \ - | grep -v 'log entries' | grep -v 'hook:' + | grep -v 'log entries' | grep -v 'hook:' \ + | grep -v '^[0-3] .*' # filter instable changeset order hg cat -r tip srcfull-hg/src/a hg cat -r tip srcfull-hg/src/b/c diff --git a/tests/test-convert-cvs.out b/tests/test-convert-cvs.out --- a/tests/test-convert-cvs.out +++ b/tests/test-convert-cvs.out @@ -67,10 +67,6 @@ creating changesets 4 changeset entries sorting... converting... -3 Initial revision -2 import -1 initial checkin -0 ci0 updating tags a c