From b4f10133bf8995f55c7ce56d6828b4a3efdda046 Mon Sep 17 00:00:00 2001
From: Pádraig Brady <P@draigBrady.com>
Date: Tue, 19 Jan 2016 15:51:00 +0000
Subject: tests: avoid false failure in preserve-slink-time.sh on GPFS

* tests/cp/preserve-slink-time.sh: Add a delay between the
ln and the cp so that there is enough difference between
the timestamps so GPFS won't discard the update.
Reported by Assaf Gordon.
---
 tests/cp/preserve-slink-time.sh | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

(limited to 'tests/cp')

diff --git a/tests/cp/preserve-slink-time.sh b/tests/cp/preserve-slink-time.sh
index 6c1835c38..3054d7913 100755
--- a/tests/cp/preserve-slink-time.sh
+++ b/tests/cp/preserve-slink-time.sh
@@ -31,11 +31,21 @@ case $(stat --format=%y dangle) in
   ??:??:??.000000000) sleep 2;;
 esac
 
-# Can't use --format=%x, as lstat() modifies atime on some platforms.
-cp -Pp dangle d2 || framework_failure_
-stat --format=%y dangle > t1 || framework_failure_
-stat --format=%y d2 > t2 || framework_failure_
-
-compare t1 t2 || fail=1
+copy_timestamp_() {
+  sleep $1
+  rm -f d2
+  cp -Pp dangle d2 || framework_failure_
+  # Can't use --format=%x, as lstat() modifies atime on some platforms.
+  stat --format=%y dangle > t1 || framework_failure_
+  stat --format=%y d2 > t2 || framework_failure_
+  compare t1 t2
+}
+
+# We retry with a delay at least 1.5s because on GPFS
+# it was seen that the timestamp wasn't updated unless there
+# was sufficient delay between the ln and cp.
+# I.e., if there wasn't sufficient difference in
+# the timestamp being updated, the update was discarded.
+retry_delay_ copy_timestamp_ .1 4 || fail=1
 
 Exit $fail
-- 
cgit v1.2.3-70-g09d2