From 9b10323c2f9ec5dcac85c675eab901a978dbc14c Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Mon, 23 Feb 2015 19:14:27 +0100 Subject: [PATCH] tests: fix IPs in unix-test --- tests/docker-ocserv/ocserv-unix.conf | 2 +- tests/unix-test | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/docker-ocserv/ocserv-unix.conf b/tests/docker-ocserv/ocserv-unix.conf index 4577a21d..33dd30db 100644 --- a/tests/docker-ocserv/ocserv-unix.conf +++ b/tests/docker-ocserv/ocserv-unix.conf @@ -260,7 +260,7 @@ 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.1.0/255.255.255.0 +route = 192.168.99.0/255.255.255.0 #route = 192.168.5.0/255.255.255.0 #route = fef4:db8:1000:1001::/64 diff --git a/tests/unix-test b/tests/unix-test index fee3dc37..70e1ccfc 100755 --- a/tests/unix-test +++ b/tests/unix-test @@ -62,14 +62,14 @@ rm -f pass.tmp sleep 5 # The client IP depends on the username so it shouldn't change. -ping -w 5 192.168.99.0 +ping -w 5 192.168.99.1 if test $? != 0;then kill $PID echo "Cannot ping ocserv" stop fi -ping -w 5 192.168.99.0 -s 1500 +ping -w 5 192.168.99.1 -s 1500 if test $? != 0;then kill $PID echo "Cannot ping ocserv" @@ -83,14 +83,14 @@ printf "echo root" >>echo-admin.tmp printf "\n" >>echo-admin.tmp chmod 755 echo-admin.tmp export SSH_ASKPASS="./echo-admin.tmp" -setsid ssh -T -F config.tmp root@192.168.99.0 occtl show user test >out.tmp 2>&1 +setsid ssh -T -F config.tmp root@192.168.99.1 occtl show user test >out.tmp 2>&1 cat out.tmp printf "#\!/bin/sh\n" >echo-admin.tmp printf "echo root" >>echo-admin.tmp printf "\n" >>echo-admin.tmp chmod 755 echo-admin.tmp -setsid ssh -T -F config.tmp root@192.168.99.0 occtl show user test >out.tmp 2>&1 +setsid ssh -T -F config.tmp root@192.168.99.1 occtl show user test >out.tmp 2>&1 cat out.tmp rm -f echo-admin.tmp rm -f config.tmp @@ -108,14 +108,14 @@ rm -f out.tmp # There is an issue in nuttcp that makes it crash under docker if # /proc/sys/net/ipv4/tcp_adv_win_scale does not exist. -#nuttcp -T 10 -t 192.168.99.0 +#nuttcp -T 10 -t 192.168.99.1 #if test $? != 0;then # kill $PID # echo "Cannot send to ocserv" # stop #fi -#nuttcp -T 10 -r 192.168.99.0 +#nuttcp -T 10 -r 192.168.99.1 #if test $? != 0;then # kill $PID # echo "Cannot recv from ocserv"