summaryrefslogtreecommitdiff
path: root/testing/tests/tnc/tnccs-dynamic
diff options
context:
space:
mode:
authorYves-Alexis Perez <corsac@debian.org>2015-11-18 15:19:06 +0100
committerYves-Alexis Perez <corsac@debian.org>2015-11-18 15:19:06 +0100
commitfb6324eb165d1577bc4541bc2fc6758c56da2a95 (patch)
treeafbc98168e056e7839ac0dc434db8f88ffb34833 /testing/tests/tnc/tnccs-dynamic
parentea6a577e967da0ee954b06b7bdc6796e97eb9b2b (diff)
parent1e980d6be0ef0e243c6fe82b5e855454b97e24a4 (diff)
downloadvyos-strongswan-fb6324eb165d1577bc4541bc2fc6758c56da2a95.tar.gz
vyos-strongswan-fb6324eb165d1577bc4541bc2fc6758c56da2a95.zip
Merge tag 'upstream/5.3.4'
Upstream version 5.3.4
Diffstat (limited to 'testing/tests/tnc/tnccs-dynamic')
-rw-r--r--testing/tests/tnc/tnccs-dynamic/evaltest.dat4
-rw-r--r--testing/tests/tnc/tnccs-dynamic/pretest.dat4
2 files changed, 4 insertions, 4 deletions
diff --git a/testing/tests/tnc/tnccs-dynamic/evaltest.dat b/testing/tests/tnc/tnccs-dynamic/evaltest.dat
index 405298381..3d0c55449 100644
--- a/testing/tests/tnc/tnccs-dynamic/evaltest.dat
+++ b/testing/tests/tnc/tnccs-dynamic/evaltest.dat
@@ -21,7 +21,7 @@ moon:: cat /var/log/daemon.log::removed TNCCS Connection ID 2::YES
moon:: ipsec statusall 2> /dev/null::rw-allow.*10.1.0.0/28 === 192.168.0.100/32::YES
moon:: ipsec statusall 2> /dev/null::rw-isolate.*10.1.0.16/28 === 192.168.0.200/32::YES
carol::ping -c 1 PH_IP_ALICE::64 bytes from PH_IP_ALICE: icmp_req=1::YES
-carol::ping -c 1 PH_IP_VENUS::64 bytes from PH_IP_ALICE: icmp_req=1::NO
+carol::ping -c 1 -W 1 PH_IP_VENUS::64 bytes from PH_IP_ALICE: icmp_req=1::NO
dave:: ping -c 1 PH_IP_VENUS::64 bytes from PH_IP_VENUS: icmp_req=1::YES
-dave:: ping -c 1 PH_IP_ALICE::64 bytes from PH_IP_VENUS: icmp_req=1::NO
+dave:: ping -c 1 -W 1 PH_IP_ALICE::64 bytes from PH_IP_VENUS: icmp_req=1::NO
diff --git a/testing/tests/tnc/tnccs-dynamic/pretest.dat b/testing/tests/tnc/tnccs-dynamic/pretest.dat
index 60775a11e..927b89d06 100644
--- a/testing/tests/tnc/tnccs-dynamic/pretest.dat
+++ b/testing/tests/tnc/tnccs-dynamic/pretest.dat
@@ -7,7 +7,7 @@ dave::cat /etc/tnc_config
moon::LEAK_DETECTIVE_DISABLE=1 ipsec start
carol::LEAK_DETECTIVE_DISABLE=1 ipsec start
dave::ipsec start
-carol::sleep 1
+carol::expect-connection home
carol::ipsec up home
+dave::expect-connection home
dave::ipsec up home
-dave::sleep 1