From b241dc58ec9400d690b43ed6a04cd953fe549de8 Mon Sep 17 00:00:00 2001
From: Evan Hunt <each@isc.org>
Date: Mon, 14 Jan 2019 12:24:21 -0800
Subject: [PATCH] b/t/s/dnssec/tests.sh: Cleanup showprivate() function

---
 bin/tests/system/dnssec/tests.sh | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh
index 65607392b9..7878a6c350 100644
--- a/bin/tests/system/dnssec/tests.sh
+++ b/bin/tests/system/dnssec/tests.sh
@@ -40,18 +40,14 @@ showprivate () {
 }
 
 # check that signing records are marked as complete
-checkprivate () { (
+checkprivate () {
     for i in 1 2 3 4 5 6 7 8 9 10; do
-        ret=0
-        showprivate "$@" | grep incomplete >/dev/null 2>&1 && { ret=1; sleep 1; continue; }
-        break
+        showprivate "$@" | grep -q incomplete || return 0
+	sleep 1
     done
-    [ $ret -eq 1 ] && {
-        echo_d "$1 signing incomplete"
-        return 1
-    }
-    return 0
-) }
+    echo_d "$1 signing incomplete"
+    return 1
+}
 
 # check that a zone file is raw format, version 0
 israw0 () {