Wed Oct 19 00:19:13 2016 UTC ()
Make sure to run cleanup

Should fix "tests: did not complete" failures.


(ozaki-r)
diff -r1.5 -r1.6 src/tests/net/if_pppoe/t_pppoe.sh

cvs diff -r1.5 -r1.6 src/tests/net/if_pppoe/t_pppoe.sh (expand / switch to unified diff)

--- src/tests/net/if_pppoe/t_pppoe.sh 2016/10/18 04:10:24 1.5
+++ src/tests/net/if_pppoe/t_pppoe.sh 2016/10/19 00:19:13 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: t_pppoe.sh,v 1.5 2016/10/18 04:10:24 ozaki-r Exp $ 1# $NetBSD: t_pppoe.sh,v 1.6 2016/10/19 00:19:13 ozaki-r Exp $
2# 2#
3# Copyright (c) 2016 Internet Initiative Japan Inc. 3# Copyright (c) 2016 Internet Initiative Japan 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#
@@ -174,45 +174,45 @@ run_test() @@ -174,45 +174,45 @@ run_test()
174 local setup_clientparam="pppoectl pppoe0 myauthproto=$auth \ 174 local setup_clientparam="pppoectl pppoe0 myauthproto=$auth \
175 'myauthname=$AUTHNAME' \ 175 'myauthname=$AUTHNAME' \
176 'myauthsecret=invalidsecret' \ 176 'myauthsecret=invalidsecret' \
177 'hisauthproto=none'" 177 'hisauthproto=none'"
178 atf_check -s exit:0 -x "$HIJACKING $setup_clientparam" 178 atf_check -s exit:0 -x "$HIJACKING $setup_clientparam"
179 atf_check -s exit:0 rump.ifconfig pppoe0 up 179 atf_check -s exit:0 rump.ifconfig pppoe0 up
180 wait_for_session_established dontfail 180 wait_for_session_established dontfail
181 atf_check -s not-exit:0 -o ignore -e ignore \ 181 atf_check -s not-exit:0 -o ignore -e ignore \
182 rump.ping -c 1 -w $TIMEOUT $SERVER_IP 182 rump.ping -c 1 -w $TIMEOUT $SERVER_IP
183 atf_check -s exit:0 -o match:'initial' -x "$HIJACKING pppoectl -d pppoe0" 183 atf_check -s exit:0 -o match:'initial' -x "$HIJACKING pppoectl -d pppoe0"
184 unset RUMP_SERVER 184 unset RUMP_SERVER
185} 185}
186 186
187atf_test_case pap cleanup 187atf_test_case pppoe_pap cleanup
188 188
189pppoe_pap_head() 189pppoe_pap_head()
190{ 190{
191 atf_set "descr" "Does simple pap tests" 191 atf_set "descr" "Does simple pap tests"
192 atf_set "require.progs" "rump_server pppoectl" 192 atf_set "require.progs" "rump_server pppoectl"
193} 193}
194 194
195pppoe_pap_body() 195pppoe_pap_body()
196{ 196{
197 run_test pap 197 run_test pap
198} 198}
199 199
200pppoe_pap_cleanup() 200pppoe_pap_cleanup()
201{ 201{
202 cleanup 202 cleanup
203} 203}
204 204
205atf_test_case chap cleanup 205atf_test_case pppoe_chap cleanup
206 206
207pppoe_chap_head() 207pppoe_chap_head()
208{ 208{
209 atf_set "descr" "Does simple chap tests" 209 atf_set "descr" "Does simple chap tests"
210 atf_set "require.progs" "rump_server pppoectl" 210 atf_set "require.progs" "rump_server pppoectl"
211} 211}
212 212
213pppoe_chap_body() 213pppoe_chap_body()
214{ 214{
215 run_test chap 215 run_test chap
216} 216}
217 217
218pppoe_chap_cleanup() 218pppoe_chap_cleanup()