summaryrefslogtreecommitdiff
path: root/regress/usr.sbin/bgpd
diff options
context:
space:
mode:
authorClaudio Jeker <claudio@cvs.openbsd.org>2019-05-29 08:54:54 +0000
committerClaudio Jeker <claudio@cvs.openbsd.org>2019-05-29 08:54:54 +0000
commit62a3c4800f827a90c96b09156d122ef7a963ac6c (patch)
treebcfc3b4596b6e4491dd5c71dbab7ec09599e1be4 /regress/usr.sbin/bgpd
parent1c7314251a33284e99a1039f162f1f4c276dbe73 (diff)
After fixing the pfkey code a bit lets retry with a bit less workarounds.
In my testing the regress test is failing maybe once in 50 tries. Lets see how bluhm@'s infrastructure is behaving.
Diffstat (limited to 'regress/usr.sbin/bgpd')
-rw-r--r--regress/usr.sbin/bgpd/integrationtests/md5.sh29
1 files changed, 20 insertions, 9 deletions
diff --git a/regress/usr.sbin/bgpd/integrationtests/md5.sh b/regress/usr.sbin/bgpd/integrationtests/md5.sh
index 3430558ff4c..ad2a562faec 100644
--- a/regress/usr.sbin/bgpd/integrationtests/md5.sh
+++ b/regress/usr.sbin/bgpd/integrationtests/md5.sh
@@ -1,5 +1,5 @@
#!/bin/ksh
-# $OpenBSD: md5.sh,v 1.2 2019/02/27 05:41:32 benno Exp $
+# $OpenBSD: md5.sh,v 1.3 2019/05/29 08:54:53 claudio Exp $
set -e
@@ -62,11 +62,6 @@ route -T ${RDOMAIN2} exec ${BGPD} \
-v -f ${BGPDCONFIGDIR}/bgpd.md5.rdomain2.conf
sleep 3
-echo debuging
-route -T ${RDOMAIN1} exec bgpctl neigh RDOMAIN2 clear
-route -T ${RDOMAIN2} exec bgpctl neigh RDOMAIN1 clear
-sleep 20
-tail -25 /var/log/daemon
echo test1
route -T ${RDOMAIN1} exec bgpctl sh sum | \
@@ -75,8 +70,6 @@ route -T ${RDOMAIN1} exec bgpctl sh sum | \
else { print "no session"; exit 1; }
}} END { if (f != 1) { print "bad bgpctl output"; exit 2; }}'
-sleep 1
-
echo test2
route -T ${RDOMAIN2} exec bgpctl sh sum | \
awk '{ if ($1 ~ /^RDOMAIN1/) { f=1; print $7;
@@ -84,6 +77,24 @@ route -T ${RDOMAIN2} exec bgpctl sh sum | \
else { print "no session"; exit 1; }
}} END { if (f != 1) { print "bad bgpctl output"; exit 2; }}'
-sleep 1
+echo resetting sessions
+route -T ${RDOMAIN1} exec bgpctl neigh RDOMAIN2 clear
+#route -T ${RDOMAIN2} exec bgpctl neigh RDOMAIN1 clear
+sleep 10
+#tail -25 /var/log/daemon
+
+echo test3
+route -T ${RDOMAIN1} exec bgpctl sh sum | \
+ awk '{ if ($1 ~ /^RDOMAIN2/) { f=1; print $7;
+ if ($7 == "0") { print "ok"; exit 0; }
+ else { print "no session"; exit 1; }
+ }} END { if (f != 1) { print "bad bgpctl output"; exit 2; }}'
+
+echo test4
+route -T ${RDOMAIN2} exec bgpctl sh sum | \
+ awk '{ if ($1 ~ /^RDOMAIN1/) { f=1; print $7;
+ if ($7 == "0") { print "ok"; exit 0; }
+ else { print "no session"; exit 1; }
+ }} END { if (f != 1) { print "bad bgpctl output"; exit 2; }}'
exit 0