@matheusbsbs / matheus-bagliano / commits / b3c81cff02
Fork 0

t9400: Work around CVS' deficiencies

If we are too fast with our changes, the file in the working copy might still have the same mtime as noted in the CVS/Entries. This will cause CVS to happily report to the server that the file is unmodified which can lead to data loss (and in our case test failure). CVS sucks! Work around that by sleeping for a second. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>

Frank Lichtenheld committed May 27, 2007 at 14:33 UTC b3c81cff02e56a62bd657148da757fdfd8dc6255
1 file changed +2
t/t9400-git-cvsserver-server.sh
+2
@@ -250,6 +250,7 @@ test_expect_success 'cvs update (merge)' \
250 git commit -q -m "Merge test (merge)" &&
251 git push gitcvs.git >/dev/null &&
252 cd cvswork &&
253 + sleep 1 && touch merge &&
254 GIT_CONFIG="$git_config" cvs -Q update &&
255 diff -q merge ../expected'
256
@@ -292,6 +293,7 @@ test_expect_success 'cvs update (merge no-op)' \
293 git commit -q -m "Merge test (no-op)" &&
294 git push gitcvs.git >/dev/null &&
295 cd cvswork &&
296 + sleep 1 && touch merge &&
297 GIT_CONFIG="$git_config" cvs -Q update &&
298 diff -q merge ../merge'
299