diff options
author | Tobias Brunner <tobias@strongswan.org> | 2016-06-14 20:41:14 +0200 |
---|---|---|
committer | Tobias Brunner <tobias@strongswan.org> | 2016-06-16 14:35:18 +0200 |
commit | aacf84d837e7334035cda26c1c7de20bdf8881dd (patch) | |
tree | 7a0d4a3099fd093bdcc0f25086ee539b79bc772e /testing/tests/tnc | |
parent | 8f56bbc82b50cb999f312162bc9dd46d789803f7 (diff) | |
download | strongswan-aacf84d837e7334035cda26c1c7de20bdf8881dd.tar.bz2 strongswan-aacf84d837e7334035cda26c1c7de20bdf8881dd.tar.xz |
testing: Add expect-connection calls for all tests and hosts
There are some exceptions (e.g. those that use auto=start or p2pnat).
Diffstat (limited to 'testing/tests/tnc')
21 files changed, 40 insertions, 5 deletions
diff --git a/testing/tests/tnc/tnccs-11-radius-block/pretest.dat b/testing/tests/tnc/tnccs-11-radius-block/pretest.dat index baf8c972f..cc0ce6c31 100644 --- a/testing/tests/tnc/tnccs-11-radius-block/pretest.dat +++ b/testing/tests/tnc/tnccs-11-radius-block/pretest.dat @@ -14,6 +14,7 @@ dave::rm /etc/swanctl/x509/* moon::service charon start carol::service charon start dave::service charon start +moon::expect-connection rw carol::expect-connection home carol::swanctl --initiate --child home dave::expect-connection home diff --git a/testing/tests/tnc/tnccs-11-radius-pts/pretest.dat b/testing/tests/tnc/tnccs-11-radius-pts/pretest.dat index c96e0631f..5745ffede 100644 --- a/testing/tests/tnc/tnccs-11-radius-pts/pretest.dat +++ b/testing/tests/tnc/tnccs-11-radius-pts/pretest.dat @@ -18,6 +18,8 @@ dave::rm /etc/swanctl/x509/* moon::service charon start carol::service charon start dave::service charon start +moon::expect-connection rw-allow +moon::expect-connection rw-isolate carol::expect-connection home carol::swanctl --initiate --child home dave::expect-connection home diff --git a/testing/tests/tnc/tnccs-11-radius/pretest.dat b/testing/tests/tnc/tnccs-11-radius/pretest.dat index baf8c972f..57e2ee6b4 100644 --- a/testing/tests/tnc/tnccs-11-radius/pretest.dat +++ b/testing/tests/tnc/tnccs-11-radius/pretest.dat @@ -14,6 +14,8 @@ dave::rm /etc/swanctl/x509/* moon::service charon start carol::service charon start dave::service charon start +moon::expect-connection rw-allow +moon::expect-connection rw-isolate carol::expect-connection home carol::swanctl --initiate --child home dave::expect-connection home diff --git a/testing/tests/tnc/tnccs-11/pretest.dat b/testing/tests/tnc/tnccs-11/pretest.dat index c8ab14343..e173ae798 100644 --- a/testing/tests/tnc/tnccs-11/pretest.dat +++ b/testing/tests/tnc/tnccs-11/pretest.dat @@ -11,6 +11,8 @@ dave::rm /etc/swanctl/x509/* moon::service charon start carol::service charon start dave::service charon start +moon::expect-connection rw-allow +moon::expect-connection rw-isolate carol::expect-connection home carol::swanctl --initiate --child home 2> /dev/null dave::expect-connection home diff --git a/testing/tests/tnc/tnccs-20-block/pretest.dat b/testing/tests/tnc/tnccs-20-block/pretest.dat index c8ab14343..c09abf917 100644 --- a/testing/tests/tnc/tnccs-20-block/pretest.dat +++ b/testing/tests/tnc/tnccs-20-block/pretest.dat @@ -11,6 +11,7 @@ dave::rm /etc/swanctl/x509/* moon::service charon start carol::service charon start dave::service charon start +moon::expect-connection rw carol::expect-connection home carol::swanctl --initiate --child home 2> /dev/null dave::expect-connection home diff --git a/testing/tests/tnc/tnccs-20-client-retry/pretest.dat b/testing/tests/tnc/tnccs-20-client-retry/pretest.dat index c8ab14343..e173ae798 100644 --- a/testing/tests/tnc/tnccs-20-client-retry/pretest.dat +++ b/testing/tests/tnc/tnccs-20-client-retry/pretest.dat @@ -11,6 +11,8 @@ dave::rm /etc/swanctl/x509/* moon::service charon start carol::service charon start dave::service charon start +moon::expect-connection rw-allow +moon::expect-connection rw-isolate carol::expect-connection home carol::swanctl --initiate --child home 2> /dev/null dave::expect-connection home diff --git a/testing/tests/tnc/tnccs-20-fail-init/pretest.dat b/testing/tests/tnc/tnccs-20-fail-init/pretest.dat index c8ab14343..e173ae798 100644 --- a/testing/tests/tnc/tnccs-20-fail-init/pretest.dat +++ b/testing/tests/tnc/tnccs-20-fail-init/pretest.dat @@ -11,6 +11,8 @@ dave::rm /etc/swanctl/x509/* moon::service charon start carol::service charon start dave::service charon start +moon::expect-connection rw-allow +moon::expect-connection rw-isolate carol::expect-connection home carol::swanctl --initiate --child home 2> /dev/null dave::expect-connection home diff --git a/testing/tests/tnc/tnccs-20-fail-resp/pretest.dat b/testing/tests/tnc/tnccs-20-fail-resp/pretest.dat index 3dba1d75e..5af3b7500 100644 --- a/testing/tests/tnc/tnccs-20-fail-resp/pretest.dat +++ b/testing/tests/tnc/tnccs-20-fail-resp/pretest.dat @@ -6,5 +6,7 @@ carol::rm /etc/swanctl/rsa/* carol::rm /etc/swanctl/x509/* moon::service charon start carol::service charon start +moon::expect-connection rw-allow +moon::expect-connection rw-isolate carol::expect-connection home carol::swanctl --initiate --child home 2> /dev/null diff --git a/testing/tests/tnc/tnccs-20-hcd-eap/pretest.dat b/testing/tests/tnc/tnccs-20-hcd-eap/pretest.dat index db8ce1061..f9b4159d9 100644 --- a/testing/tests/tnc/tnccs-20-hcd-eap/pretest.dat +++ b/testing/tests/tnc/tnccs-20-hcd-eap/pretest.dat @@ -13,6 +13,8 @@ alice::service charon start moon::service charon start carol::service charon start dave::service charon start +moon::expect-connection rw-allow +moon::expect-connection rw-isolate carol::expect-connection home carol::swanctl --initiate --child home 2> /dev/null dave::expect-connection home diff --git a/testing/tests/tnc/tnccs-20-mutual-eap-fail/pretest.dat b/testing/tests/tnc/tnccs-20-mutual-eap-fail/pretest.dat index 0a3563986..ac707d436 100644 --- a/testing/tests/tnc/tnccs-20-mutual-eap-fail/pretest.dat +++ b/testing/tests/tnc/tnccs-20-mutual-eap-fail/pretest.dat @@ -2,5 +2,6 @@ moon::iptables-restore < /etc/iptables.rules sun::iptables-restore < /etc/iptables.rules moon::service charon start sun::service charon start -moon::expect-connection mutual -moon::swanctl --initiate --child mutual +sun::expect-connection mutual +moon::expect-connection mutual +moon::swanctl --initiate --child mutual diff --git a/testing/tests/tnc/tnccs-20-mutual-eap/pretest.dat b/testing/tests/tnc/tnccs-20-mutual-eap/pretest.dat index 0a3563986..ac707d436 100644 --- a/testing/tests/tnc/tnccs-20-mutual-eap/pretest.dat +++ b/testing/tests/tnc/tnccs-20-mutual-eap/pretest.dat @@ -2,5 +2,6 @@ moon::iptables-restore < /etc/iptables.rules sun::iptables-restore < /etc/iptables.rules moon::service charon start sun::service charon start -moon::expect-connection mutual -moon::swanctl --initiate --child mutual +sun::expect-connection mutual +moon::expect-connection mutual +moon::swanctl --initiate --child mutual diff --git a/testing/tests/tnc/tnccs-20-os-pts/pretest.dat b/testing/tests/tnc/tnccs-20-os-pts/pretest.dat index 81537cc62..03e5f22af 100644 --- a/testing/tests/tnc/tnccs-20-os-pts/pretest.dat +++ b/testing/tests/tnc/tnccs-20-os-pts/pretest.dat @@ -15,6 +15,8 @@ dave::rm /etc/swanctl/x509/* moon::service charon start carol::service charon start dave::service charon start +moon::expect-connection rw-allow +moon::expect-connection rw-isolate carol::expect-connection home carol::swanctl --initiate --child home 2> /dev/null dave::expect-connection home diff --git a/testing/tests/tnc/tnccs-20-os/pretest.dat b/testing/tests/tnc/tnccs-20-os/pretest.dat index fa8d089f2..13ae2b71f 100644 --- a/testing/tests/tnc/tnccs-20-os/pretest.dat +++ b/testing/tests/tnc/tnccs-20-os/pretest.dat @@ -16,6 +16,8 @@ dave::rm /etc/swanctl/x509/* moon::service charon start carol::service charon start dave::service charon start +moon::expect-connection rw-allow +moon::expect-connection rw-isolate carol::expect-connection home carol::swanctl --initiate --child home 2> /dev/null dave::expect-connection home diff --git a/testing/tests/tnc/tnccs-20-pdp-eap/pretest.dat b/testing/tests/tnc/tnccs-20-pdp-eap/pretest.dat index 6292d6909..36c7cc6a2 100644 --- a/testing/tests/tnc/tnccs-20-pdp-eap/pretest.dat +++ b/testing/tests/tnc/tnccs-20-pdp-eap/pretest.dat @@ -22,6 +22,8 @@ alice::service charon start moon::service charon start dave::service charon start carol::service charon start +moon::expect-connection rw-allow +moon::expect-connection rw-isolate dave::expect-connection home dave::swanctl --initiate --child home 2> /dev/null carol::expect-connection home diff --git a/testing/tests/tnc/tnccs-20-pdp-pt-tls/pretest.dat b/testing/tests/tnc/tnccs-20-pdp-pt-tls/pretest.dat index ea93b2d2b..d64467c01 100644 --- a/testing/tests/tnc/tnccs-20-pdp-pt-tls/pretest.dat +++ b/testing/tests/tnc/tnccs-20-pdp-pt-tls/pretest.dat @@ -15,7 +15,6 @@ alice::rm /etc/swanctl/x509/aliceCert.pem alice::rm /etc/swanctl/rsa/aliceKey.pem alice::service apache2 start alice::service charon start -alice::expect-connection aaa winnetou::ip route add 10.1.0.0/16 via 192.168.0.1 dave::ip route add 10.1.0.0/16 via 192.168.0.1 dave::cat /etc/pts/options diff --git a/testing/tests/tnc/tnccs-20-pts-no-ecc/pretest.dat b/testing/tests/tnc/tnccs-20-pts-no-ecc/pretest.dat index 4b1c45ef9..d89aa2309 100644 --- a/testing/tests/tnc/tnccs-20-pts-no-ecc/pretest.dat +++ b/testing/tests/tnc/tnccs-20-pts-no-ecc/pretest.dat @@ -15,6 +15,8 @@ dave::rm /etc/swanctl/x509/* moon::service charon start dave::service charon start carol::service charon start +moon::expect-connection rw-allow +moon::expect-connection rw-isolate dave::expect-connection home dave::swanctl --initiate --child home 2> /dev/null carol::expect-connection home diff --git a/testing/tests/tnc/tnccs-20-pts/pretest.dat b/testing/tests/tnc/tnccs-20-pts/pretest.dat index 4b1c45ef9..d89aa2309 100644 --- a/testing/tests/tnc/tnccs-20-pts/pretest.dat +++ b/testing/tests/tnc/tnccs-20-pts/pretest.dat @@ -15,6 +15,8 @@ dave::rm /etc/swanctl/x509/* moon::service charon start dave::service charon start carol::service charon start +moon::expect-connection rw-allow +moon::expect-connection rw-isolate dave::expect-connection home dave::swanctl --initiate --child home 2> /dev/null carol::expect-connection home diff --git a/testing/tests/tnc/tnccs-20-server-retry/pretest.dat b/testing/tests/tnc/tnccs-20-server-retry/pretest.dat index c8ab14343..e173ae798 100644 --- a/testing/tests/tnc/tnccs-20-server-retry/pretest.dat +++ b/testing/tests/tnc/tnccs-20-server-retry/pretest.dat @@ -11,6 +11,8 @@ dave::rm /etc/swanctl/x509/* moon::service charon start carol::service charon start dave::service charon start +moon::expect-connection rw-allow +moon::expect-connection rw-isolate carol::expect-connection home carol::swanctl --initiate --child home 2> /dev/null dave::expect-connection home diff --git a/testing/tests/tnc/tnccs-20-tls/pretest.dat b/testing/tests/tnc/tnccs-20-tls/pretest.dat index 709a7714b..1d11baa99 100644 --- a/testing/tests/tnc/tnccs-20-tls/pretest.dat +++ b/testing/tests/tnc/tnccs-20-tls/pretest.dat @@ -7,6 +7,8 @@ dave::cat /etc/tnc_config moon::service charon start carol::service charon start dave::service charon start +moon::expect-connection rw-allow +moon::expect-connection rw-isolate carol::expect-connection home carol::swanctl --initiate --child home 2> /dev/null dave::expect-connection home diff --git a/testing/tests/tnc/tnccs-20/pretest.dat b/testing/tests/tnc/tnccs-20/pretest.dat index c8ab14343..e173ae798 100644 --- a/testing/tests/tnc/tnccs-20/pretest.dat +++ b/testing/tests/tnc/tnccs-20/pretest.dat @@ -11,6 +11,8 @@ dave::rm /etc/swanctl/x509/* moon::service charon start carol::service charon start dave::service charon start +moon::expect-connection rw-allow +moon::expect-connection rw-isolate carol::expect-connection home carol::swanctl --initiate --child home 2> /dev/null dave::expect-connection home diff --git a/testing/tests/tnc/tnccs-dynamic/pretest.dat b/testing/tests/tnc/tnccs-dynamic/pretest.dat index c8ab14343..e173ae798 100644 --- a/testing/tests/tnc/tnccs-dynamic/pretest.dat +++ b/testing/tests/tnc/tnccs-dynamic/pretest.dat @@ -11,6 +11,8 @@ dave::rm /etc/swanctl/x509/* moon::service charon start carol::service charon start dave::service charon start +moon::expect-connection rw-allow +moon::expect-connection rw-isolate carol::expect-connection home carol::swanctl --initiate --child home 2> /dev/null dave::expect-connection home |