[src/trunk]: src/tests/net/ipsec "Mark key_timehandler_ch callout as MP-safe"...

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

details:   https://anonhg.NetBSD.org/src/rev/13add5a18f97
branches:  trunk
changeset: 357391:13add5a18f97
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Thu Nov 09 04:50:37 2017 +0000

description:
"Mark key_timehandler_ch callout as MP-safe" change needs one more sec to make lifetime tests stable

diffstat:

 tests/net/ipsec/t_ipsec_misc.sh |  12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diffs (61 lines):

diff -r 23840b39b263 -r 13add5a18f97 tests/net/ipsec/t_ipsec_misc.sh
--- a/tests/net/ipsec/t_ipsec_misc.sh   Thu Nov 09 03:08:12 2017 +0000
+++ b/tests/net/ipsec/t_ipsec_misc.sh   Thu Nov 09 04:50:37 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: t_ipsec_misc.sh,v 1.20 2017/10/20 03:45:47 ozaki-r Exp $
+#      $NetBSD: t_ipsec_misc.sh,v 1.21 2017/11/09 04:50:37 ozaki-r Exp $
 #
 # Copyright (c) 2017 Internet Initiative Japan Inc.
 # All rights reserved.
@@ -88,6 +88,7 @@
        local proto_cap=$(echo $proto | tr 'a-z' 'A-Z')
        local algo_args="$(generate_algo_args $proto $algo)"
        local lifetime=3
+       local buffertime=2
 
        rump_server_crypto_start $SOCK_LOCAL netipsec
        rump_server_crypto_start $SOCK_PEER netipsec
@@ -119,7 +120,7 @@
        setup_sasp $proto "$algo_args" $ip_local $ip_peer 1
 
        # Wait for the SAs to be expired
-       atf_check -s exit:0 sleep 2
+       atf_check -s exit:0 sleep $((1 + $buffertime))
 
        # Check the SAs have been expired
        export RUMP_SERVER=$SOCK_LOCAL
@@ -148,7 +149,7 @@
        atf_check -s exit:0 -o match:"$ip_peer > $ip_local: $proto_cap" \
            cat $outfile
 
-       atf_check -s exit:0 sleep $((lifetime + 1))
+       atf_check -s exit:0 sleep $((lifetime + $buffertime))
 
        export RUMP_SERVER=$SOCK_LOCAL
        $DEBUG && $HIJACKING setkey -D
@@ -176,6 +177,7 @@
        local proto_cap=$(echo $proto | tr 'a-z' 'A-Z')
        local algo_args="$(generate_algo_args $proto $algo)"
        local lifetime=3
+       local buffertime=2
 
        rump_server_crypto_start $SOCK_LOCAL netinet6 netipsec
        rump_server_crypto_start $SOCK_PEER netinet6 netipsec
@@ -205,7 +207,7 @@
        setup_sasp $proto "$algo_args" $ip_local $ip_peer 1
 
        # Wait for the SAs to be expired
-       atf_check -s exit:0 sleep 2
+       atf_check -s exit:0 sleep $((1 + $buffertime))
 
        # Check the SAs have been expired
        export RUMP_SERVER=$SOCK_LOCAL
@@ -234,7 +236,7 @@
        atf_check -s exit:0 -o match:"$ip_peer > $ip_local: $proto_cap" \
            cat $outfile
 
-       atf_check -s exit:0 sleep $((lifetime + 1))
+       atf_check -s exit:0 sleep $((lifetime + $buffertime))
 
        export RUMP_SERVER=$SOCK_LOCAL
        $DEBUG && $HIJACKING setkey -D