aboutsummaryrefslogtreecommitdiffstats
path: root/testing/tests/swanctl/rw-psk-ipv4
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2015-11-19 17:53:31 +0100
committerAndreas Steffen <andreas.steffen@strongswan.org>2015-12-11 18:26:53 +0100
commitae37090e65dce94c86eab7d1927da2917f31af16 (patch)
treedff2c82df14771fea8f24d86709307d6279a88d9 /testing/tests/swanctl/rw-psk-ipv4
parentb77e25c381a61cb9c3aebe58628d61dc9958e41d (diff)
downloadstrongswan-ae37090e65dce94c86eab7d1927da2917f31af16.tar.bz2
strongswan-ae37090e65dce94c86eab7d1927da2917f31af16.tar.xz
testing: Use expect-connection in swanctl scenarios
Only in net2net-start do we have to use `sleep` to ensure the SA is up when the tests are running.
Diffstat (limited to 'testing/tests/swanctl/rw-psk-ipv4')
-rwxr-xr-xtesting/tests/swanctl/rw-psk-ipv4/pretest.dat4
1 files changed, 3 insertions, 1 deletions
diff --git a/testing/tests/swanctl/rw-psk-ipv4/pretest.dat b/testing/tests/swanctl/rw-psk-ipv4/pretest.dat
index d55df408c..519b168ae 100755
--- a/testing/tests/swanctl/rw-psk-ipv4/pretest.dat
+++ b/testing/tests/swanctl/rw-psk-ipv4/pretest.dat
@@ -7,6 +7,8 @@ dave::cd /etc/swanctl; rm rsa/* x509/* x509ca/*
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::expect-connection rw
+carol::expect-connection home
carol::swanctl --initiate --child home 2> /dev/null
+dave::expect-connection home
dave::swanctl --initiate --child home 2> /dev/null