From: Simon McVittie <smcv@debian.org>
Date: Mon, 9 Jan 2017 13:02:43 +0000 (+0000)
Subject: t/git-cgi.t: fix race condition
X-Git-Tag: debian/3.20120629.2+deb7u2~15
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/b6774bc6afac48e2c0a122647edc1485e7174a6e

t/git-cgi.t: fix race condition

We need the changes to take place at least 1 second after the first
rebuild, so that the changed files are seen to have changed.

(cherry picked from commit 62c9df67212c7c42eb03ad9e36891afe4bc2d9a2)
---

diff --git a/t/git-cgi.t b/t/git-cgi.t
index 05af37740..6dfe18ad6 100755
--- a/t/git-cgi.t
+++ b/t/git-cgi.t
@@ -178,6 +178,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');