Sat Oct 1 15:35:22 2016 UTC ()
Adjust tests to new output. Wait for DaD to finish before pinging.


(roy)
diff -r1.12 -r1.13 src/tests/net/if/t_ifconfig.sh
cvs diff -r1.12 -r1.13 src/tests/net/if/t_ifconfig.sh (expand / switch to unified diff)

--- src/tests/net/if/t_ifconfig.sh 2016/09/14 16:18:31 1.12
+++ src/tests/net/if/t_ifconfig.sh 2016/10/01 15:35:22 1.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: t_ifconfig.sh,v 1.12 2016/09/14 16:18:31 christos Exp $ 1# $NetBSD: t_ifconfig.sh,v 1.13 2016/10/01 15:35:22 roy Exp $
2# 2#
3# Copyright (c) 2015 The NetBSD Foundation, Inc. 3# Copyright (c) 2015 The NetBSD Foundation, Inc.
4# All rights reserved. 4# All rights reserved.
5# 5#
6# Redistribution and use in source and binary forms, with or without 6# Redistribution and use in source and binary forms, with or without
7# modification, are permitted provided that the following conditions 7# modification, are permitted provided that the following conditions
8# are met: 8# are met:
9# 1. Redistributions of source code must retain the above copyright 9# 1. Redistributions of source code must retain the above copyright
10# notice, this list of conditions and the following disclaimer. 10# notice, this list of conditions and the following disclaimer.
11# 2. Redistributions in binary form must reproduce the above copyright 11# 2. Redistributions in binary form must reproduce the above copyright
12# notice, this list of conditions and the following disclaimer in the 12# notice, this list of conditions and the following disclaimer in the
13# documentation and/or other materials provided with the distribution. 13# documentation and/or other materials provided with the distribution.
14# 14#
@@ -223,33 +223,34 @@ ifconfig_parameters_body() @@ -223,33 +223,34 @@ ifconfig_parameters_body()
223 unset RUMP_SERVER 223 unset RUMP_SERVER
224 224
225 export RUMP_SERVER=${RUMP_SERVER1} 225 export RUMP_SERVER=${RUMP_SERVER1}
226 226
227 # active 227 # active
228 atf_check -s exit:0 rump.ifconfig shmif0 link b2:a0:75:00:00:01 active 228 atf_check -s exit:0 rump.ifconfig shmif0 link b2:a0:75:00:00:01 active
229 atf_check -s exit:0 -o match:'address:.b2:a0:75:00:00:01' \ 229 atf_check -s exit:0 -o match:'address:.b2:a0:75:00:00:01' \
230 rump.ifconfig shmif0 230 rump.ifconfig shmif0
231 # down, up 231 # down, up
232 atf_check -s exit:0 rump.ifconfig shmif0 down 232 atf_check -s exit:0 rump.ifconfig shmif0 down
233 atf_check -s ignore -o ignore -e match:'down' rump.ping -c 1 \ 233 atf_check -s ignore -o ignore -e match:'down' rump.ping -c 1 \
234 -w $TIMEOUT -n 192.168.0.2 234 -w $TIMEOUT -n 192.168.0.2
235 atf_check -s exit:0 rump.ifconfig shmif0 up 235 atf_check -s exit:0 rump.ifconfig shmif0 up
 236 atf_check -s exit:0 rump.ifconfig -w 10
236 atf_check -s exit:0 -o ignore rump.ping -c 1 -w $TIMEOUT -n 192.168.0.2 237 atf_check -s exit:0 -o ignore rump.ping -c 1 -w $TIMEOUT -n 192.168.0.2
237 238
238 # alias 239 # alias
239 atf_check -s exit:0 rump.ifconfig shmif0 inet 192.168.1.1/24 alias 240 atf_check -s exit:0 rump.ifconfig shmif0 inet 192.168.1.1/24 alias
240 atf_check -s exit:0 -o match:'alias 192.168.1.1' rump.ifconfig shmif0 241 atf_check -s exit:0 -o match:'192.168.1.1/24' rump.ifconfig shmif0
241 atf_check -s exit:0 rump.ifconfig shmif0 inet 192.168.1.1/24 -alias 242 atf_check -s exit:0 rump.ifconfig shmif0 inet 192.168.1.1/24 -alias
242 atf_check -s exit:0 -o not-match:'192.168.1.1' rump.ifconfig shmif0 243 atf_check -s exit:0 -o not-match:'192.168.1.1/24' rump.ifconfig shmif0
243 atf_check -s exit:0 rump.ifconfig shmif0 inet6 fc00::1 244 atf_check -s exit:0 rump.ifconfig shmif0 inet6 fc00::1
244 atf_check -s exit:0 rump.ifconfig shmif0 inet6 fc00::2 245 atf_check -s exit:0 rump.ifconfig shmif0 inet6 fc00::2
245 atf_check -s exit:0 -o match:'fc00::1' rump.ifconfig shmif0 inet6 246 atf_check -s exit:0 -o match:'fc00::1' rump.ifconfig shmif0 inet6
246 atf_check -s exit:0 -o match:'fc00::2' rump.ifconfig shmif0 inet6 247 atf_check -s exit:0 -o match:'fc00::2' rump.ifconfig shmif0 inet6
247 248
248 # delete 249 # delete
249 atf_check -s exit:0 rump.ifconfig shmif0 inet 192.168.1.1 alias 250 atf_check -s exit:0 rump.ifconfig shmif0 inet 192.168.1.1 alias
250 atf_check -s exit:0 rump.ifconfig shmif0 inet 192.168.1.1 delete 251 atf_check -s exit:0 rump.ifconfig shmif0 inet 192.168.1.1 delete
251 atf_check -s exit:0 -o not-match:'192.168.1.1' rump.ifconfig shmif0 inet 252 atf_check -s exit:0 -o not-match:'192.168.1.1' rump.ifconfig shmif0 inet
252 atf_check -s exit:0 rump.ifconfig shmif0 inet 192.168.0.1 delete 253 atf_check -s exit:0 rump.ifconfig shmif0 inet 192.168.0.1 delete
253 atf_check -s exit:0 -o not-match:'192.168.0.1' rump.ifconfig shmif0 inet 254 atf_check -s exit:0 -o not-match:'192.168.0.1' rump.ifconfig shmif0 inet
254 atf_check -s exit:0 rump.ifconfig shmif0 inet6 fc00::1 delete 255 atf_check -s exit:0 rump.ifconfig shmif0 inet6 fc00::1 delete
255 atf_check -s exit:0 rump.ifconfig shmif0 inet6 fc00::2 delete 256 atf_check -s exit:0 rump.ifconfig shmif0 inet6 fc00::2 delete