[src/trunk]: src/tests/net/arp Improve test stability and output messages on ...

[ozaki-r <ozaki-r%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3aea127cf4b8
branches:  trunk
changeset: 352025:3aea127cf4b8
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Sat Mar 11 02:01:10 2017 +0000

description:
Improve test stability and output messages on failure

diffstat:

 tests/net/arp/t_dad.sh |  15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diffs (39 lines):

diff -r 48835660a6df -r 3aea127cf4b8 tests/net/arp/t_dad.sh
--- a/tests/net/arp/t_dad.sh    Sat Mar 11 01:25:04 2017 +0000
+++ b/tests/net/arp/t_dad.sh    Sat Mar 11 02:01:10 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: t_dad.sh,v 1.14 2017/03/08 05:30:56 ozaki-r Exp $
+#      $NetBSD: t_dad.sh,v 1.15 2017/03/11 02:01:10 ozaki-r Exp $
 #
 # Copyright (c) 2015 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -168,21 +168,24 @@
        export RUMP_SERVER=$SOCKLOCAL
 
        # The primary address isn't marked as duplicated
-       atf_check -s not-exit:0 -x "rump.ifconfig shmif0 |grep $localip1 |grep -iq duplicated"
+       atf_check -s exit:0 -o not-match:"${localip1}.+DUPLICATED" \
+           rump.ifconfig shmif0
 
        #
        # Add a new address duplicated with the peer server
        #
        atf_check -s exit:0 rump.ifconfig shmif0 inet $peerip alias
-       atf_check -s exit:0 sleep 1
+       atf_check -s exit:0 sleep 2
 
        # The new address is marked as duplicated
-       atf_check -s exit:0 -x "rump.ifconfig shmif0 |grep $peerip |grep -iq duplicated"
+       atf_check -s exit:0 -o match:"${peerip}.+DUPLICATED" \
+           rump.ifconfig shmif0
 
        # A unique address isn't marked as duplicated
        atf_check -s exit:0 rump.ifconfig shmif0 inet $localip2 alias
-       atf_check -s exit:0 sleep 1
-       atf_check -s not-exit:0 -x "rump.ifconfig shmif0 |grep $localip2 |grep -iq duplicated"
+       atf_check -s exit:0 sleep 2
+       atf_check -s exit:0 -o not-match:"${localip2}.+DUPLICATED" \
+           rump.ifconfig shmif0
 
        rump_server_destroy_ifaces
 }