do not check for type of dpd action any more

diff --git a/testing/tests/ikev2/dpd-clear/evaltest.dat b/testing/tests/ikev2/dpd-clear/evaltest.dat
index 6383c1b1689e78077736fa00b986505887f270b5..86c0227bd56ab98c26c783fb8f2b93d4299533f0 100644 (file)
--- a/testing/tests/ikev2/dpd-clear/evaltest.dat
+++ b/testing/tests/ikev2/dpd-clear/evaltest.dat
@@ -4,4 +4,3 @@ moon::sleep 180::no output expected::NO
 moon::cat /var/log/daemon.log::sending DPD request::YES
 moon::cat /var/log/daemon.log::retransmit.*of request::YES
 moon::cat /var/log/daemon.log::giving up after 5 retransmits::YES
-moon::cat /var/log/daemon.log::dpd action for rw is DPD_CLEAR::YES

diff --git a/testing/tests/ikev2/dpd-hold/evaltest.dat b/testing/tests/ikev2/dpd-hold/evaltest.dat
index 4c8cdbb8e59ba0f3ff8685cc3949f775db56c602..2cf06376201e89afc9da1c2c6d59ea0a69c66fef 100644 (file)
--- a/testing/tests/ikev2/dpd-hold/evaltest.dat
+++ b/testing/tests/ikev2/dpd-hold/evaltest.dat
@@ -6,7 +6,6 @@ carol::sleep 180::no output expected::NO
 carol::cat /var/log/daemon.log::sending DPD request::YES
 carol::cat /var/log/daemon.log::retransmit.*of request::YES
 carol::cat /var/log/daemon.log::giving up after 5 retransmits::YES
-carol::cat /var/log/daemon.log::dpd action for home is DPD_ROUTE::YES
 carol::iptables -D INPUT -i eth0 -s PH_IP_MOON -j DROP::no output expected::NO
 moon::iptables -D INPUT -i eth0 -s PH_IP_CAROL -j DROP::no output expected::NO
 carol::ping -c 1 PH_IP_ALICE::trigger route::NO

diff --git a/testing/tests/ikev2/dpd-restart/evaltest.dat b/testing/tests/ikev2/dpd-restart/evaltest.dat
index b1eee8aa5e6b58fecfb6f87cdc46449c5974b453..28edd4823c6ccadfa0288bf37acd2b201828d132 100644 (file)
--- a/testing/tests/ikev2/dpd-restart/evaltest.dat
+++ b/testing/tests/ikev2/dpd-restart/evaltest.dat
@@ -6,7 +6,6 @@ carol::sleep 180::no output expected::NO
 carol::cat /var/log/daemon.log::sending DPD request::YES
 carol::cat /var/log/daemon.log::retransmit.*of request::YES
 carol::cat /var/log/daemon.log::giving up after 5 retransmits::YES
-carol::cat /var/log/daemon.log::dpd action for home is DPD_RESTART::YES
 carol::iptables -D INPUT -i eth0 -s PH_IP_MOON -j DROP::no output expected::NO
 moon::iptables -D INPUT -i eth0 -s PH_IP_CAROL -j DROP::no output expected::NO
 carol::sleep 10::no output expected::NO