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>
Michael J Gruber committed
Apr 14, 2011 at 19:38 UTC
e3b02bc9533007f9e7aa9d7738a0f92c952dcff6
2 files changed
+5
-1
t/t3306-notes-prune.sh
+3
@@ -20,6 +20,9 @@ test_expect_success 'setup: create a few commits with notes' '
20
git add file3 &&
21
test_tick &&
22
git commit -m 3rd &&
23
+ COMMIT_FILE=.git/objects/5e/e1c35e83ea47cd3cc4f8cbee0568915fbbbd29 &&
24
+ test -f $COMMIT_FILE &&
25
+ test-chmtime =+0 $COMMIT_FILE &&
26
git notes add -m "Note #3"
27
'
28
t/t5304-prune.sh
+2
-1
@@ -14,7 +14,8 @@ add_blob() {
14
BLOB=$(echo aleph_0 | git hash-object -w --stdin) &&
15
BLOB_FILE=.git/objects/$(echo $BLOB | sed "s/^../&\//") &&
16
test $((1 + $before)) = $(git count-objects | sed "s/ .*//") &&
17
- test -f $BLOB_FILE
17
+ test -f $BLOB_FILE &&
18
+ test-chmtime =+0 $BLOB_FILE
19
}
20
21
test_expect_success setup '