X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/29b91c970bdc7a8856c0b4f8dbcd915614a46006..796f5749859a1fa48ad068b5f2ab9889e0ae88e8:/t/git-cgi.t?ds=sidebyside

diff --git a/t/git-cgi.t b/t/git-cgi.t
index 05af37740..ee47261ed 100755
--- a/t/git-cgi.t
+++ b/t/git-cgi.t
@@ -142,7 +142,12 @@ sub run_git {
 	my ($in, $out);
 	ok(run(['git', @$args], \$in, \$out, init => sub {
 		chdir 't/tmp/in' or die $!;
-		$ENV{EMAIL} = 'nobody@ikiwiki-tests.invalid';
+		my $name = 'The IkiWiki Tests';
+		my $email = 'nobody@ikiwiki-tests.invalid';
+		if ($args->[0] eq 'commit') {
+			$ENV{GIT_AUTHOR_NAME} = $ENV{GIT_COMMITTER_NAME} = $name;
+			$ENV{GIT_AUTHOR_EMAIL} = $ENV{GIT_COMMITTER_EMAIL} = $email;
+		}
 	}), "$desc at $filename:$line");
 	return $out;
 }
@@ -178,6 +183,10 @@ sub test {
 	like($content, qr{This is the first test page});
 	my $orig_sha1 = run_git(['rev-list', '--max-count=1', 'HEAD']);
 
+	# We have to wait 1 second here so that new writes are guaranteed
+	# to have a strictly larger mtime.
+	sleep 1;
+
 	# Test the git hook, which accepts git commits
 	writefile('doc/writable/one.mdwn', 't/tmp/in',
 		'This is new content for the first test page');
@@ -282,6 +291,10 @@ sub test {
 	$content = readfile('t/tmp/in/two.mdwn');
 	like($content, qr{Here is new content for the second page});
 
+	# We have to wait 1 second here so that new writes are guaranteed
+	# to have a strictly larger mtime.
+	sleep 1;
+
 	# This one can legitimately be reverted
 	$content = run_cgi(method => 'post',
 		params => {