testing: Wait a bit in swanctl scenarios before interacting with the daemon

diff --git a/testing/tests/swanctl/ip-pool/pretest.dat b/testing/tests/swanctl/ip-pool/pretest.dat
index d1afdf0be847d92e9891250aee3c0852954a860f..25288f5ba68b3b51b76dd434ec1fc90117e144f8 100755 (executable)
--- a/testing/tests/swanctl/ip-pool/pretest.dat
+++ b/testing/tests/swanctl/ip-pool/pretest.dat
@@ -1,9 +1,10 @@
 moon::iptables-restore < /etc/iptables.rules
 carol::iptables-restore < /etc/iptables.rules
 dave::iptables-restore < /etc/iptables.rules
-moon::service charon start 2> /dev/null 
+moon::service charon start 2> /dev/null
 carol::service charon start 2> /dev/null
 dave::service charon start 2> /dev/null
+moon::sleep 1
 moon::swanctl --load-conns 2> /dev/null
 carol::swanctl --load-conns 2> /dev/null
 dave::swanctl --load-conns 2> /dev/null

diff --git a/testing/tests/swanctl/net2net-cert/pretest.dat b/testing/tests/swanctl/net2net-cert/pretest.dat
index 2c4ba6ca2d91b4a1c62d455add1eda280d8912fd..382564367940f413b03c102152062d8542cdd4b9 100755 (executable)
--- a/testing/tests/swanctl/net2net-cert/pretest.dat
+++ b/testing/tests/swanctl/net2net-cert/pretest.dat
@@ -1,7 +1,8 @@
 moon::iptables-restore < /etc/iptables.rules
 sun::iptables-restore < /etc/iptables.rules
-moon::service charon start 2> /dev/null 
+moon::service charon start 2> /dev/null
 sun::service charon start 2> /dev/null
+moon::sleep 1
 moon::swanctl --load-conns 2> /dev/null
 sun::swanctl --load-conns 2> /dev/null
 moon::swanctl --load-creds 2> /dev/null

diff --git a/testing/tests/swanctl/net2net-route/pretest.dat b/testing/tests/swanctl/net2net-route/pretest.dat
index 61e33fa24119c718789b8cfc792f740ff67a7741..71f8f88854c5a8e6b22dc6501bfbc75b3ec5da83 100755 (executable)
--- a/testing/tests/swanctl/net2net-route/pretest.dat
+++ b/testing/tests/swanctl/net2net-route/pretest.dat
@@ -1,9 +1,10 @@
 sun::iptables-restore < /etc/iptables.rules
 moon::iptables-restore < /etc/iptables.rules
 sun::service charon start 2> /dev/null
-moon::service charon start 2> /dev/null 
+moon::service charon start 2> /dev/null
+moon::sleep 1
 sun::swanctl --load-creds 2> /dev/null
 moon::swanctl --load-creds 2> /dev/null
 sun::swanctl --load-conns 2> /dev/null
 moon::swanctl --load-conns 2> /dev/null
-alice::ping -c 3 10.2.0.10 
+alice::ping -c 3 10.2.0.10

diff --git a/testing/tests/swanctl/net2net-start/pretest.dat b/testing/tests/swanctl/net2net-start/pretest.dat
index 0560092c533052c704629e51dbb146729751b409..5528eb70f76fc149480334222cec38b8a702372d 100755 (executable)
--- a/testing/tests/swanctl/net2net-start/pretest.dat
+++ b/testing/tests/swanctl/net2net-start/pretest.dat
@@ -1,9 +1,10 @@
 sun::iptables-restore < /etc/iptables.rules
 moon::iptables-restore < /etc/iptables.rules
 sun::service charon start 2> /dev/null
-moon::service charon start 2> /dev/null 
+moon::service charon start 2> /dev/null
+moon::sleep 1
 sun::swanctl --load-creds 2> /dev/null
 moon::swanctl --load-creds 2> /dev/null
 sun::swanctl --load-conns 2> /dev/null
 moon::swanctl --load-conns 2> /dev/null
-moon::sleep 1 
+moon::sleep 1

diff --git a/testing/tests/swanctl/rw-cert/pretest.dat b/testing/tests/swanctl/rw-cert/pretest.dat
index 3fdf01d813f73adb16a1d1e7b4585b7fc93b4f88..75b359ac16913c7ecbf25e984770d649b2e00eef 100755 (executable)
--- a/testing/tests/swanctl/rw-cert/pretest.dat
+++ b/testing/tests/swanctl/rw-cert/pretest.dat
@@ -1,9 +1,10 @@
 moon::iptables-restore < /etc/iptables.rules
 carol::iptables-restore < /etc/iptables.rules
 dave::iptables-restore < /etc/iptables.rules
-moon::service charon start 2> /dev/null 
+moon::service charon start 2> /dev/null
 carol::service charon start 2> /dev/null
 dave::service charon start 2> /dev/null
+moon::sleep 1
 moon::swanctl --load-conns 2> /dev/null
 carol::swanctl --load-conns 2> /dev/null
 dave::swanctl --load-conns 2> /dev/null

diff --git a/testing/tests/swanctl/rw-psk-fqdn/pretest.dat b/testing/tests/swanctl/rw-psk-fqdn/pretest.dat
index 2018f5d950a16711e469cc4d96858fac78f39733..7507ac355d949473cf58b07678fdffbd814f306a 100755 (executable)
--- a/testing/tests/swanctl/rw-psk-fqdn/pretest.dat
+++ b/testing/tests/swanctl/rw-psk-fqdn/pretest.dat
@@ -4,9 +4,10 @@ dave::iptables-restore < /etc/iptables.rules
 moon::cd /etc/swanctl; rm rsa/* x509/* x509ca/*
 carol::cd /etc/swanctl; rm rsa/* x509/* x509ca/*
 dave::cd /etc/swanctl; rm rsa/* x509/* x509ca/*
-moon::service charon start 2> /dev/null 
+moon::service charon start 2> /dev/null
 carol::service charon start 2> /dev/null
 dave::service charon start 2> /dev/null
+moon::sleep 1
 moon::swanctl --load-conns 2> /dev/null
 carol::swanctl --load-conns 2> /dev/null
 dave::swanctl --load-conns 2> /dev/null

diff --git a/testing/tests/swanctl/rw-psk-ipv4/pretest.dat b/testing/tests/swanctl/rw-psk-ipv4/pretest.dat
index 2018f5d950a16711e469cc4d96858fac78f39733..7507ac355d949473cf58b07678fdffbd814f306a 100755 (executable)
--- a/testing/tests/swanctl/rw-psk-ipv4/pretest.dat
+++ b/testing/tests/swanctl/rw-psk-ipv4/pretest.dat
@@ -4,9 +4,10 @@ dave::iptables-restore < /etc/iptables.rules
 moon::cd /etc/swanctl; rm rsa/* x509/* x509ca/*
 carol::cd /etc/swanctl; rm rsa/* x509/* x509ca/*
 dave::cd /etc/swanctl; rm rsa/* x509/* x509ca/*
-moon::service charon start 2> /dev/null 
+moon::service charon start 2> /dev/null
 carol::service charon start 2> /dev/null
 dave::service charon start 2> /dev/null
+moon::sleep 1
 moon::swanctl --load-conns 2> /dev/null
 carol::swanctl --load-conns 2> /dev/null
 dave::swanctl --load-conns 2> /dev/null