test-convert-cvs: filter unstable cvs output. stable
authorPierre-Yves David <pierre-yves.david@ens-lyon.org>
Mon, 22 Mar 2010 22:19:40 +0100
branchstable
changeset 10760 bdb60057f905
parent 10759 9f6e30a89f11
child 10761 16a13fdb4b36
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.
tests/test-convert-cvs
tests/test-convert-cvs.out
--- a/tests/test-convert-cvs	Tue Mar 23 11:48:14 2010 +0100
+++ b/tests/test-convert-cvs	Mon Mar 22 22:19:40 2010 +0100
@@ -80,7 +80,8 @@
 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
 
--- a/tests/test-convert-cvs.out	Tue Mar 23 11:48:14 2010 +0100
+++ b/tests/test-convert-cvs.out	Mon Mar 22 22:19:40 2010 +0100
@@ -67,10 +67,6 @@
 4 changeset entries
 sorting...
 converting...
-3 Initial revision
-2 import
-1 initial checkin
-0 ci0
 updating tags
 a
 c