t0004-heartbeat-timeout.sh in rainbows-4.5.0

- old
+ new

@@ -21,21 +21,21 @@
 	test $(curl -sSf http://$listen/) -eq $worker_pid
 }
 
 t_begin "block the worker process to force it to die" && {
 	rm $ok
-	t0=$(date +%s)
+	t0=$(unix_time)
 	err="$(curl -sSf http://$listen/block-forever 2>&1 || > $ok)"
-	t1=$(date +%s)
+	t1=$(unix_time)
 	elapsed=$(($t1 - $t0))
 	t_info "elapsed=$elapsed err=$err"
 	test x"$err" != x"Should never get here"
 	test x"$err" != x"$worker_pid"
 }
 
 t_begin "ensure worker was killed" && {
 	test -e $ok
-	test 1 -eq $(grep timeout $r_err | grep killing | wc -l)
+	test 1 -eq $(grep timeout $r_err | grep killing | count_lines)
 }
 
 t_begin "ensure timeout took at least 3 seconds" && {
 	test $elapsed -ge 3
 }