diff options
| author | Martin Willi <martin@strongswan.org> | 2006-07-14 12:29:26 +0000 |
|---|---|---|
| committer | Martin Willi <martin@strongswan.org> | 2006-07-14 12:29:26 +0000 |
| commit | 106e9fc6f857a720598dc60190d329e05a4919cf (patch) | |
| tree | cde94547b947442a63a997d0682edb0a8b626672 | |
| parent | bf4df11f449769c7fc2199313059739f0c118970 (diff) | |
| download | strongswan-106e9fc6f857a720598dc60190d329e05a4919cf.tar.bz2 strongswan-106e9fc6f857a720598dc60190d329e05a4919cf.tar.xz | |
updated mixed tests to new charon output
| -rw-r--r-- | testing/tests/ike/rw-cert/evaltest.dat | 4 | ||||
| -rw-r--r-- | testing/tests/ike/rw_v1-net_v2/evaltest.dat | 4 | ||||
| -rw-r--r-- | testing/tests/ikev2/nat-portswitch/posttest.dat | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/testing/tests/ike/rw-cert/evaltest.dat b/testing/tests/ike/rw-cert/evaltest.dat index 04037f352..71496d2f2 100644 --- a/testing/tests/ike/rw-cert/evaltest.dat +++ b/testing/tests/ike/rw-cert/evaltest.dat @@ -1,7 +1,7 @@ moon::ipsec statusall::rw.*STATE_QUICK_R2.*IPsec SA established::YES -moon::ipsec statusall::rw.*IKE_SA_ESTABLISHED::YES +moon::ipsec statusall::rw.*ESTABLISHED::YES carol::ipsec statusall::home.*STATE_QUICK_I2.*IPsec SA established::YES -dave::ipsec statusall::home.*IKE_SA_ESTABLISHED::YES +dave::ipsec statusall::home.*ESTABLISHED::YES carol::ping -c 1 PH_IP_ALICE::64 bytes from PH_IP_ALICE: icmp_seq=1::YES dave::ping -c 1 PH_IP_ALICE::64 bytes from PH_IP_ALICE: icmp_seq=1::YES moon::tcpdump::IP carol.strongswan.org > moon.strongswan.org: ESP::YES diff --git a/testing/tests/ike/rw_v1-net_v2/evaltest.dat b/testing/tests/ike/rw_v1-net_v2/evaltest.dat index 9227e6e8e..4eace50b7 100644 --- a/testing/tests/ike/rw_v1-net_v2/evaltest.dat +++ b/testing/tests/ike/rw_v1-net_v2/evaltest.dat @@ -1,5 +1,5 @@ -moon::ipsec statusall::net-net.*IKE_SA_ESTABLISHED::YES -sun::ipsec statusall::net-net.*IKE_SA_ESTABLISHED::YES +moon::ipsec statusall::net-net.*ESTABLISHED::YES +sun::ipsec statusall::net-net.*ESTABLISHED::YES alice::ping -c 1 PH_IP_BOB::64 bytes from PH_IP_BOB: icmp_seq=1::YES sun::tcpdump::IP moon.strongswan.org > sun.strongswan.org: ESP::YES sun::tcpdump::IP sun.strongswan.org > moon.strongswan.org: ESP::YES diff --git a/testing/tests/ikev2/nat-portswitch/posttest.dat b/testing/tests/ikev2/nat-portswitch/posttest.dat index 94212ef64..3b9f53e9b 100644 --- a/testing/tests/ikev2/nat-portswitch/posttest.dat +++ b/testing/tests/ikev2/nat-portswitch/posttest.dat @@ -3,4 +3,4 @@ alice::ipsec stop sun::rm /etc/ipsec.d/certs/* alice::rm /etc/ipsec.d/certs/* moon::iptables -t nat -F -moon::contrack -F +moon::conntrack -F |