mirror of
https://github.com/git/git.git
synced 2024-11-25 02:44:48 +08:00
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>
This commit is contained in:
parent
2e4aef5893
commit
b3c81cff02
@ -250,6 +250,7 @@ test_expect_success 'cvs update (merge)' \
|
||||
git commit -q -m "Merge test (merge)" &&
|
||||
git push gitcvs.git >/dev/null &&
|
||||
cd cvswork &&
|
||||
sleep 1 && touch merge &&
|
||||
GIT_CONFIG="$git_config" cvs -Q update &&
|
||||
diff -q merge ../expected'
|
||||
|
||||
@ -292,6 +293,7 @@ test_expect_success 'cvs update (merge no-op)' \
|
||||
git commit -q -m "Merge test (no-op)" &&
|
||||
git push gitcvs.git >/dev/null &&
|
||||
cd cvswork &&
|
||||
sleep 1 && touch merge &&
|
||||
GIT_CONFIG="$git_config" cvs -Q update &&
|
||||
diff -q merge ../merge'
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user