Merge pull request kubernetes#58157 from liggitt/automated-cherry-pick-of-#57805-upstream-release-1.8

Kubernetes Submit Queue · web-flow · commit b30876a5539f · 2018-01-15T05:14:49.000-08:00
Automatic merge from submit-queue. Automated cherry pick of kubernetes#57805: Avoid error on closed pipe Cherry pick of kubernetes#57805 on release-1.8. kubernetes#57805: Avoid error on closed pipe ```release-note NONE ```
diff --git a/hack/lib/test.sh b/hack/lib/test.sh
@@ -265,7 +265,7 @@ kube::test::if_has_string() {
   local message=$1
   local match=$2
 
-  if echo "$message" | grep -q "$match"; then
+  if grep -q "${match}" <<< "${message}"; then
     echo "Successful"
     echo "message:$message"
     echo "has:$match"
@@ -283,7 +283,7 @@ kube::test::if_has_not_string() {
   local message=$1
   local match=$2
 
-  if echo "$message" | grep -q "$match"; then
+  if grep -q "${match}" <<< "${message}"; then
     echo "FAIL!"
     echo "message:$message"
     echo "has:$match"
