Use is helper instead of grep

test/basic.bats

@@ -6,7 +6,7 @@ load helpers
   ytester -loop -serve "wave$YTAG"
   running ynetd
   ! running ytester
-  ysend hello | grep -qFx "wave$YTAG"
+  is "`ysend hello`" = "wave$YTAG"
   running ytester
   close
   ! running ynetd

test/port_forward.bats

@@ -10,12 +10,12 @@ load helpers
   ysend -timeout 1s hello | lines 0
 
   # Tester on proxy port.
-  ysend -port "$PROXY_PORT" foo | grep -q "nocmd$YTAG"
+  is "`ysend -port "$PROXY_PORT" foo`" = "nocmd$YTAG"
 
   ynetd -proxy ":$LISTEN_PORT localhost:$PROXY_PORT"
   running ynetd
 
-  ysend -timeout 1s hello | grep -q "nocmd$YTAG"
+  is "`ysend -timeout 1s hello`" = "nocmd$YTAG"
   kill "$tester" || :
 
   ylog -y | grep -qF 'cmd: <nil>'

test/reaper.bats

@@ -22,7 +22,7 @@ load helpers
 
   # kill and restart multiple times.
   for i in 1 2 3; {
-    ysend hello | grep -qFx "reap$YTAG"
+    is "`ysend hello`" = "reap$YTAG"
     running ytester
     kill `ypidof ytester`
 
@@ -41,13 +41,13 @@ load helpers
   running ynetd
   ! running ytester
 
-  ysend hello | grep -qFx "reap$YTAG"
+  is "`ysend hello`" = "reap$YTAG"
   running ytester
   kill -s CHLD $YPID
 
   # The signal was fake, the process should still be running.
   running ytester
   # kill it, try again
 
-  ysend hello | grep -qFx "reap$YTAG"
+  is "`ysend hello`" = "reap$YTAG"
 }

test/stop.bats

@@ -14,7 +14,7 @@ load helpers
 
     # Use it.
     for j in 1 2 3; {
-      ysend hello | grep -qFx "stop$YTAG"
+      is "`ysend hello`" = "stop$YTAG"
       sleep 1
     }
 

test/timeout.bats

@@ -8,7 +8,7 @@ load helpers
 
   start=`date +%s`
   # This will wait.
-  ysend "hello" | grep -qFx "timely$YTAG"
+  is "`ysend "hello"`" = "timely$YTAG"
   end=`date +%s`
 
   is $end -ge $((start + 4))
@@ -45,5 +45,5 @@ load helpers
   # Wait for listen to start.
   sleep 2
 
-  ysend hello | grep -qFx "timely$YTAG"
+  is "`ysend hello`" = "timely$YTAG"
 }