t0004: fix timing bug

gitster · gitster · commit 329636b435a7 · 2008-07-12T04:15:56.000-07:00
The test created an initial commit, made .git/objects unwritable and then
exercised various codepaths to create loose commit, tree and blob objects
to make sure the commands notice failures from these attempts.

However, the initial commit was not preceded with test_tick, which made
its object name depend on the timestamp.  The names of all the later tree
and blob objects the test tried to create were static.  If the initial
commit's object name happened to begin with the same two hexdigits as the
tree or blob objects the test later attempted to create, the fan-out
directory in which these tree or blob would be created is already created
when the initial commit was made, and the object creation succeeds, and
commands being tested should not notice any failure --- in short, the test
was bogus.

This makes the fan-out directories also unwritable, and adds test_tick
before the commit object creation to make the test repeatable.

The contents of the file to create a blob from "a" to "60" is to force the
name of the blob object to begin with "1b", which shares the fan-out
directory with the initial commit that is created with the test.  This was
useful when diagnosing the breakage of this test.

Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/t0004-unwritable.sh b/t/t0004-unwritable.sh
@@ -8,6 +8,7 @@ test_expect_success setup '
 
 	>file &&
 	git add file &&
+	test_tick &&
 	git commit -m initial &&
 	echo >file &&
 	git add file
@@ -17,36 +18,36 @@ test_expect_success setup '
 test_expect_success 'write-tree should notice unwritable repository' '
 
 	(
-		chmod a-w .git/objects
+		chmod a-w .git/objects .git/objects/?? &&
 		test_must_fail git write-tree
 	)
 	status=$?
-	chmod 775 .git/objects
+	chmod 775 .git/objects .git/objects/??
 	(exit $status)
 
 '
 
 test_expect_success 'commit should notice unwritable repository' '
 
 	(
-		chmod a-w .git/objects
+		chmod a-w .git/objects .git/objects/?? &&
 		test_must_fail git commit -m second
 	)
 	status=$?
-	chmod 775 .git/objects
+	chmod 775 .git/objects .git/objects/??
 	(exit $status)
 
 '
 
 test_expect_success 'update-index should notice unwritable repository' '
 
 	(
-		echo a >file &&
-		chmod a-w .git/objects
+		echo 6O >file &&
+		chmod a-w .git/objects .git/objects/?? &&
 		test_must_fail git update-index file
 	)
 	status=$?
-	chmod 775 .git/objects
+	chmod 775 .git/objects .git/objects/??
 	(exit $status)
 
 '
@@ -55,11 +56,11 @@ test_expect_success 'add should notice unwritable repository' '
 
 	(
 		echo b >file &&
-		chmod a-w .git/objects
+		chmod a-w .git/objects .git/objects/?? &&
 		test_must_fail git add file
 	)
 	status=$?
-	chmod 775 .git/objects
+	chmod 775 .git/objects .git/objects/??
 	(exit $status)
 
 '

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ test_expect_success setup '`
`8`	`8`
`9`	`9`	`>file &&`
`10`	`10`	`git add file &&`
	`11`	`+ test_tick &&`
`11`	`12`	`git commit -m initial &&`
`12`	`13`	`echo >file &&`
`13`	`14`	`git add file`
`@@ -17,36 +18,36 @@ test_expect_success setup '`
`17`	`18`	`test_expect_success 'write-tree should notice unwritable repository' '`
`18`	`19`
`19`	`20`	`(`
`20`		`- chmod a-w .git/objects`
	`21`	`+ chmod a-w .git/objects .git/objects/?? &&`
`21`	`22`	`test_must_fail git write-tree`
`22`	`23`	`)`
`23`	`24`	`status=$?`
`24`		`- chmod 775 .git/objects`
	`25`	`+ chmod 775 .git/objects .git/objects/??`
`25`	`26`	`(exit $status)`
`26`	`27`
`27`	`28`	`'`
`28`	`29`
`29`	`30`	`test_expect_success 'commit should notice unwritable repository' '`
`30`	`31`
`31`	`32`	`(`
`32`		`- chmod a-w .git/objects`
	`33`	`+ chmod a-w .git/objects .git/objects/?? &&`
`33`	`34`	`test_must_fail git commit -m second`
`34`	`35`	`)`
`35`	`36`	`status=$?`
`36`		`- chmod 775 .git/objects`
	`37`	`+ chmod 775 .git/objects .git/objects/??`
`37`	`38`	`(exit $status)`
`38`	`39`
`39`	`40`	`'`
`40`	`41`
`41`	`42`	`test_expect_success 'update-index should notice unwritable repository' '`
`42`	`43`
`43`	`44`	`(`
`44`		`- echo a >file &&`
`45`		`- chmod a-w .git/objects`
	`45`	`+ echo 6O >file &&`
	`46`	`+ chmod a-w .git/objects .git/objects/?? &&`
`46`	`47`	`test_must_fail git update-index file`
`47`	`48`	`)`
`48`	`49`	`status=$?`
`49`		`- chmod 775 .git/objects`
	`50`	`+ chmod 775 .git/objects .git/objects/??`
`50`	`51`	`(exit $status)`
`51`	`52`
`52`	`53`	`'`
`@@ -55,11 +56,11 @@ test_expect_success 'add should notice unwritable repository' '`
`55`	`56`
`56`	`57`	`(`
`57`	`58`	`echo b >file &&`
`58`		`- chmod a-w .git/objects`
	`59`	`+ chmod a-w .git/objects .git/objects/?? &&`
`59`	`60`	`test_must_fail git add file`
`60`	`61`	`)`
`61`	`62`	`status=$?`
`62`		`- chmod 775 .git/objects`
	`63`	`+ chmod 775 .git/objects .git/objects/??`
`63`	`64`	`(exit $status)`
`64`	`65`
`65`	`66`	`'`