commit 6c6b73bb412843c96a7dca913c41a91827d9018c
from: Stefan Sperling <stsp@stsp.name>
date: Sat Aug 10 15:24:59 2019 UTC

fix race condition in test_revert_patch_one_change

commit - 15fbc2a7fdd8aa7cd898bd2b6a382da9d1b13f6d
commit + 6c6b73bb412843c96a7dca913c41a91827d9018c
blob - d66beb7f0760252ff97e00a9b4415b40cf50049b
blob + 170bc3b29f399c15ed51b80c19922e0d5c6ba58b
--- regress/cmdline/revert.sh
+++ regress/cmdline/revert.sh
@@ -809,7 +809,10 @@ function test_revert_patch_one_change {
 		return 1
 	fi
 
-	sed -i -e 's/^2$/a/' $testroot/wt/numbers
+	# Ensure file size is changed. Avoids race condition causing test
+	# failures where 'got revert' does not see changes to revert if
+	# timestamps and size in stat info remain unchanged.
+	sed -i -e 's/^2$/aa/' $testroot/wt/numbers
 
 	# revert change with -p
 	printf "y\n" > $testroot/patchscript
@@ -826,7 +829,7 @@ function test_revert_patch_one_change {
 @@ -1,5 +1,5 @@
  1
 -2
-+a
++aa
  3
  4
  5
@@ -834,6 +837,13 @@ function test_revert_patch_one_change {
 M  numbers (change 1 of 1)
 revert this change? [y/n/q] y
 EOF
+	ret="$?"
+	if [ "$ret" != "0" ]; then
+		echo "got revert command failed unexpectedly" >&2
+		test_done "$testroot" "1"
+		return 1
+	fi
+
 	cmp -s $testroot/stdout.expected $testroot/stdout
 	ret="$?"
 	if [ "$ret" != "0" ]; then