diff options
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rwxr-xr-x | t/git-cgi.t | 4 |
2 files changed, 12 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 14045a961..d3576c528 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +ikiwiki (3.20170112) UNRELEASED; urgency=medium + + * t/git-cgi.t: Wait 1 second before doing a revert that should work. + This hopefully fixes a race condition in which the test failed + around 6% of the time. (Closes: 862494) + + -- Simon McVittie <smcv@debian.org> Sun, 14 May 2017 15:34:52 +0100 + ikiwiki (3.20170111) unstable; urgency=high * passwordauth: prevent authentication bypass via multiple name diff --git a/t/git-cgi.t b/t/git-cgi.t index ee77257b9..ee47261ed 100755 --- a/t/git-cgi.t +++ b/t/git-cgi.t @@ -291,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 => { |