From 278fd12ec1eb4fca75d8614f6117ec22244eac83 Mon Sep 17 00:00:00 2001
From: John Hood <cgull@glup.org>
Date: Tue, 29 Nov 2016 22:31:33 -0500
Subject: [PATCH] More print-to-pipe error checking in tests.

---
 src/tests/network-no-diff.test    | 4 +---
 src/tests/prediction-unicode.test | 4 ++--
 src/tests/pty-deadlock.test       | 8 ++++----
 src/tests/repeat.test             | 4 ++--
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/tests/network-no-diff.test b/src/tests/network-no-diff.test
index dc17e6b..8aa4f15 100755
--- a/src/tests/network-no-diff.test
+++ b/src/tests/network-no-diff.test
@@ -23,10 +23,8 @@ baseline()
 {
     # Generate updates that don't change the screen
     i=0
-    while [ $i -lt 10 ]; do
-	printf 'x\b'
+    while [ $i -lt 10 ] && printf 'x\b' && sleep 1; do
 	i=$((i + 1))
-	sleep 1
     done
 }
 
diff --git a/src/tests/prediction-unicode.test b/src/tests/prediction-unicode.test
index 730e5c5..bbb675c 100755
--- a/src/tests/prediction-unicode.test
+++ b/src/tests/prediction-unicode.test
@@ -52,8 +52,8 @@ tmux_commands()
     sleep 1
     printf "send-keys 0x04\n"
     # This will get killed by SIGPIPE.
-    while printf "show-options\n"; do
-	sleep 1
+    while printf "show-options\n" && sleep 1; do
+	:
     done
 } 
 
diff --git a/src/tests/pty-deadlock.test b/src/tests/pty-deadlock.test
index a28216e..219eca9 100755
--- a/src/tests/pty-deadlock.test
+++ b/src/tests/pty-deadlock.test
@@ -36,8 +36,8 @@ tmux_commands()
     # And stop the test script, so it produces its exit messge.
     printf "send-keys 0x0d\n"
     # This will get killed by SIGPIPE.
-    while printf "show-options\n"; do
-	sleep 1
+    while printf "show-options\n" && sleep 1; do
+	:
     done
 }
 
@@ -55,8 +55,8 @@ baseline()
 	       printf 'a\nb\nc\nd\ne\nf\ng\nh\ni\nj\nk\nl\nm\nn\no\np\nq\nr\ns\nt\nu\nv\nw\nx\ny\nz\n'
 	   done)
     read -r x
-    while true; do
-	printf '%s' "$blat"
+    while printf '%s' "$blat"; do
+	:
     done &
     printpid=$!
     (sleep 120; kill $$ $printpid) &
diff --git a/src/tests/repeat.test b/src/tests/repeat.test
index b5b8fd4..7830c8e 100755
--- a/src/tests/repeat.test
+++ b/src/tests/repeat.test
@@ -51,8 +51,8 @@ server()
 # Constantly send keyboard input.
 tmux_commands()
 {
-    while printf "send-keys 0x0d\n"; do
-	sleepf
+    while printf "send-keys 0x0d\n" && sleepf; do
+	:
     done
 }