diff options
| author |  Michael J Gruber <git@drmicha.warpmail.net> | 2011-04-14 19:38:13 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-04-14 10:47:18 -0700 |
| commit | e3b02bc9533007f9e7aa9d7738a0f92c952dcff6 (patch) | |
| tree | baf748939e503e428a7cfc7ea7cd12c4d3e7046e | |
| parent | git.txt: fix list continuation (diff) | |
| download | tgif-e3b02bc9533007f9e7aa9d7738a0f92c952dcff6.tar.xz | |
t3306,t5304: avoid clock skew issues
On systems where the local time and file modification time may be out of
sync (e.g. test directory on NFS) t3306 and t5305 can fail because prune
compares times such as "now" (client time) with file modification times
(server times for remote file systems). I.e., these are spurious test
failures.
Avoid this by setting the relevant modification times to the local time.
Noticed on a system with as little as 2s time skew.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t3306-notes-prune.sh | 3 | ||||
| -rwxr-xr-x | t/t5304-prune.sh | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/t/t3306-notes-prune.sh b/t/t3306-notes-prune.sh index c4282179b3..86bf909ee3 100755 --- a/t/t3306-notes-prune.sh +++ b/t/t3306-notes-prune.sh @@ -20,6 +20,9 @@ test_expect_success 'setup: create a few commits with notes' ' git add file3 && test_tick && git commit -m 3rd && + COMMIT_FILE=.git/objects/5e/e1c35e83ea47cd3cc4f8cbee0568915fbbbd29 && + test -f $COMMIT_FILE && + test-chmtime =+0 $COMMIT_FILE && git notes add -m "Note #3" ' diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh index e2ed13dba2..d645328609 100755 --- a/t/t5304-prune.sh +++ b/t/t5304-prune.sh @@ -14,7 +14,8 @@ add_blob() { BLOB=$(echo aleph_0 | git hash-object -w --stdin) && BLOB_FILE=.git/objects/$(echo $BLOB | sed "s/^../&\//") && test $((1 + $before)) = $(git count-objects | sed "s/ .*//") && - test -f $BLOB_FILE + test -f $BLOB_FILE && + test-chmtime =+0 $BLOB_FILE } test_expect_success setup ' |