From 420b003a23f39c5ac340eb0aac91b8e824c4dad9 Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Mon, 7 Dec 2015 13:54:04 +0100 Subject: [PATCH] tests: corrected routes in ocserv-fw-neg and ocserv-reload tests Also simplified the ocserv-fw-neg test by not checking whether the follow up script was run. This is part of the -fw test. --- tests/docker-ocserv/ocserv-fw-neg.conf | 8 ++++---- tests/docker-ocserv/ocserv-reload.conf | 2 +- tests/firewall-neg-test | 8 -------- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/tests/docker-ocserv/ocserv-fw-neg.conf b/tests/docker-ocserv/ocserv-fw-neg.conf index 4b14cfb0..fa1b51c8 100644 --- a/tests/docker-ocserv/ocserv-fw-neg.conf +++ b/tests/docker-ocserv/ocserv-fw-neg.conf @@ -159,7 +159,7 @@ rekey-method = ssl # DEVICE, IP_REAL (the real IP of the client), IP_LOCAL (the local IP # in the P-t-P connection), IP_REMOTE (the VPN IP of the client), # ID (a unique numeric ID); REASON may be "connect" or "disconnect". -connect-script = /usr/bin/fw-script +#connect-script = /usr/bin/fw-script #disconnect-script = /usr/bin/fw-script # UTMP @@ -248,10 +248,10 @@ ping-leases = false # # To set the server as the default gateway for the client just # comment out all routes from the server. -route = 192.168.84.0/24 -route = 10.47.59.0/24 +route = 192.168.31.0/24 +#route = 10.47.59.0/24 #route = 192.168.5.0/255.255.255.0 -route = fd91:6d87:7441:dc6a::/64 +#route = fd91:6d87:7441:dc6a::/64 no-route = 10.46.59.0/24 diff --git a/tests/docker-ocserv/ocserv-reload.conf b/tests/docker-ocserv/ocserv-reload.conf index 205df2d1..f1bbe284 100644 --- a/tests/docker-ocserv/ocserv-reload.conf +++ b/tests/docker-ocserv/ocserv-reload.conf @@ -249,7 +249,7 @@ ping-leases = false # # To set the server as the default gateway for the client just # comment out all routes from the server. -route = 10.34.79.0/24 +route = 192.168.87.0/24 #route = 192.168.5.0/255.255.255.0 #route = fd91:6d87:7341:db6a::/64 diff --git a/tests/firewall-neg-test b/tests/firewall-neg-test index dc3eac76..95b1f4e0 100755 --- a/tests/firewall-neg-test +++ b/tests/firewall-neg-test @@ -125,14 +125,6 @@ sleep 2 kill -INT $PID -sleep 4 - -check_for_file /tmp/follow-up-script-was-run -if test $? != 0;then - echo "There was an issue; followup script was not run" - stop -fi - $DOCKER stop $IMAGE_NAME $DOCKER rm $IMAGE_NAME