[PATCH] test-convert-cvs: filter unstable cvs output

Pierre-Yves David pierre-yves.david at ens-lyon.org
Mon Mar 22 16:23:44 CDT 2010


# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at ens-lyon.org>
# Date 1269292780 -3600
# Node ID f5748b4cf96a246c6bfd8c937bb47060a0dc8cbb
# Parent  61c52fedbd45c0bc486179af93209d8d5d6fe4e3
test-convert-cvs: filter unstable cvs output.

The order choosed by cvs to display commit is not stable when the test are run
under heavy CPU/IO load. The leads to irrelevant failure of the test suite.
This changeset filter 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 @@
 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 @@
 4 changeset entries
 sorting...
 converting...
-3 Initial revision
-2 import
-1 initial checkin
-0 ci0
 updating tags
 a
 c


More information about the Mercurial-devel mailing list