moved multi-level-ca-pathlen scenario

diff --git a/testing/tests/ikev2/multi-level-ca-loop/evaltest.dat b/testing/tests/ikev2/multi-level-ca-loop/evaltest.dat
index 0b7b02801283533b9450e71962ecad26210e1d89..6b77a81616aeba2101593f61e4b6593429c8beb9 100644 (file)
--- a/testing/tests/ikev2/multi-level-ca-loop/evaltest.dat
+++ b/testing/tests/ikev2/multi-level-ca-loop/evaltest.dat
@@ -1,4 +1,4 @@
-moon::cat /var/log/daemon.log::maximum ca path length of 7 levels reached::YES
+moon::cat /var/log/daemon.log::maximum path length of 7 exceeded::YES
 carol::cat /var/log/daemon.log::received AUTHENTICATION_FAILED notify error::YES
 carol::ipsec status::alice.*INSTALLED::NO
 moon::ipsec status::alice.*ESTABLISHED.*carol@strongswan.org::NO

diff --git a/testing/tests/multi-level-ca-pathlen/description.txt b/testing/tests/ikev2/multi-level-ca-pathlen/description.txt
similarity index 100%
rename from testing/tests/multi-level-ca-pathlen/description.txt
rename to testing/tests/ikev2/multi-level-ca-pathlen/description.txt

diff --git a/testing/tests/multi-level-ca-pathlen/evaltest.dat b/testing/tests/ikev2/multi-level-ca-pathlen/evaltest.dat
similarity index 100%
rename from testing/tests/multi-level-ca-pathlen/evaltest.dat
rename to testing/tests/ikev2/multi-level-ca-pathlen/evaltest.dat

diff --git a/testing/tests/multi-level-ca-pathlen/hosts/carol/etc/ipsec.conf b/testing/tests/ikev2/multi-level-ca-pathlen/hosts/carol/etc/ipsec.conf
similarity index 100%
rename from testing/tests/multi-level-ca-pathlen/hosts/carol/etc/ipsec.conf
rename to testing/tests/ikev2/multi-level-ca-pathlen/hosts/carol/etc/ipsec.conf

diff --git a/testing/tests/multi-level-ca-pathlen/hosts/carol/etc/ipsec.d/certs/carolCert.pem b/testing/tests/ikev2/multi-level-ca-pathlen/hosts/carol/etc/ipsec.d/certs/carolCert.pem
similarity index 100%
rename from testing/tests/multi-level-ca-pathlen/hosts/carol/etc/ipsec.d/certs/carolCert.pem
rename to testing/tests/ikev2/multi-level-ca-pathlen/hosts/carol/etc/ipsec.d/certs/carolCert.pem

diff --git a/testing/tests/multi-level-ca-pathlen/hosts/carol/etc/ipsec.d/private/carolKey.pem b/testing/tests/ikev2/multi-level-ca-pathlen/hosts/carol/etc/ipsec.d/private/carolKey.pem
similarity index 100%
rename from testing/tests/multi-level-ca-pathlen/hosts/carol/etc/ipsec.d/private/carolKey.pem
rename to testing/tests/ikev2/multi-level-ca-pathlen/hosts/carol/etc/ipsec.d/private/carolKey.pem

diff --git a/testing/tests/multi-level-ca-pathlen/hosts/carol/etc/ipsec.secrets b/testing/tests/ikev2/multi-level-ca-pathlen/hosts/carol/etc/ipsec.secrets
similarity index 100%
rename from testing/tests/multi-level-ca-pathlen/hosts/carol/etc/ipsec.secrets
rename to testing/tests/ikev2/multi-level-ca-pathlen/hosts/carol/etc/ipsec.secrets

diff --git a/testing/tests/multi-level-ca-pathlen/hosts/carol/etc/strongswan.conf b/testing/tests/ikev2/multi-level-ca-pathlen/hosts/carol/etc/strongswan.conf
similarity index 100%
rename from testing/tests/multi-level-ca-pathlen/hosts/carol/etc/strongswan.conf
rename to testing/tests/ikev2/multi-level-ca-pathlen/hosts/carol/etc/strongswan.conf

diff --git a/testing/tests/multi-level-ca-pathlen/hosts/moon/etc/ipsec.conf b/testing/tests/ikev2/multi-level-ca-pathlen/hosts/moon/etc/ipsec.conf
similarity index 100%
rename from testing/tests/multi-level-ca-pathlen/hosts/moon/etc/ipsec.conf
rename to testing/tests/ikev2/multi-level-ca-pathlen/hosts/moon/etc/ipsec.conf

diff --git a/testing/tests/multi-level-ca-pathlen/hosts/moon/etc/ipsec.d/cacerts/duckCert.pem b/testing/tests/ikev2/multi-level-ca-pathlen/hosts/moon/etc/ipsec.d/cacerts/duckCert.pem
similarity index 100%
rename from testing/tests/multi-level-ca-pathlen/hosts/moon/etc/ipsec.d/cacerts/duckCert.pem
rename to testing/tests/ikev2/multi-level-ca-pathlen/hosts/moon/etc/ipsec.d/cacerts/duckCert.pem

diff --git a/testing/tests/multi-level-ca-pathlen/hosts/moon/etc/ipsec.d/cacerts/researchCert.pem b/testing/tests/ikev2/multi-level-ca-pathlen/hosts/moon/etc/ipsec.d/cacerts/researchCert.pem
similarity index 100%
rename from testing/tests/multi-level-ca-pathlen/hosts/moon/etc/ipsec.d/cacerts/researchCert.pem
rename to testing/tests/ikev2/multi-level-ca-pathlen/hosts/moon/etc/ipsec.d/cacerts/researchCert.pem

diff --git a/testing/tests/multi-level-ca-pathlen/hosts/moon/etc/strongswan.conf b/testing/tests/ikev2/multi-level-ca-pathlen/hosts/moon/etc/strongswan.conf
similarity index 100%
rename from testing/tests/multi-level-ca-pathlen/hosts/moon/etc/strongswan.conf
rename to testing/tests/ikev2/multi-level-ca-pathlen/hosts/moon/etc/strongswan.conf

diff --git a/testing/tests/multi-level-ca-pathlen/posttest.dat b/testing/tests/ikev2/multi-level-ca-pathlen/posttest.dat
similarity index 100%
rename from testing/tests/multi-level-ca-pathlen/posttest.dat
rename to testing/tests/ikev2/multi-level-ca-pathlen/posttest.dat

diff --git a/testing/tests/multi-level-ca-pathlen/pretest.dat b/testing/tests/ikev2/multi-level-ca-pathlen/pretest.dat
similarity index 100%
rename from testing/tests/multi-level-ca-pathlen/pretest.dat
rename to testing/tests/ikev2/multi-level-ca-pathlen/pretest.dat

diff --git a/testing/tests/multi-level-ca-pathlen/test.conf b/testing/tests/ikev2/multi-level-ca-pathlen/test.conf
similarity index 100%
rename from testing/tests/multi-level-ca-pathlen/test.conf
rename to testing/tests/ikev2/multi-level-ca-pathlen/test.conf

diff --git a/testing/tests/ikev2/multi-level-ca/evaltest.dat b/testing/tests/ikev2/multi-level-ca/evaltest.dat
index 6b77a81616aeba2101593f61e4b6593429c8beb9..b0814556dd598903eea036e9ed3260e0faed7ffa 100644 (file)
--- a/testing/tests/ikev2/multi-level-ca/evaltest.dat
+++ b/testing/tests/ikev2/multi-level-ca/evaltest.dat
@@ -1,4 +1,19 @@
-moon::cat /var/log/daemon.log::maximum path length of 7 exceeded::YES
-carol::cat /var/log/daemon.log::received AUTHENTICATION_FAILED notify error::YES
-carol::ipsec status::alice.*INSTALLED::NO
-moon::ipsec status::alice.*ESTABLISHED.*carol@strongswan.org::NO
+moon::cat /var/log/daemon.log::fetching crl from.*http.*research.crl::YES
+moon::cat /var/log/daemon.log::crl correctly signed by.*Research CA::YES
+moon::cat /var/log/daemon.log::fetching crl from.*http.*sales.crl::YES
+moon::cat /var/log/daemon.log::crl correctly signed by.*Sales CA::YES
+moon::cat /var/log/daemon.log::fetching crl from.*http.*strongswan.crl::YES
+moon::cat /var/log/daemon.log::crl correctly signed by.*strongSwan Root CA::YES
+carol::ipsec status::alice.*INSTALLED::YES
+moon::ipsec status::alice.*ESTABLISHED.*carol@strongswan.org::YES
+carol::cat /var/log/daemon.log::received TS_UNACCEPTABLE notify, no CHILD_SA built::YES
+carol::ipsec status::venus.*INSTALLED::NO
+moon::ipsec status::venus.*ESTABLISHED.*carol@strongswan.org::NO
+moon::cat /var/log/daemon.log::constraint check failed: peer not authenticated by.*Research CA::YES
+moon::cat /var/log/daemon.log::selected peer config.*alice.*inacceptable::YES
+moon::cat /var/log/daemon.log::switching to peer config.*venus::YES
+dave::ipsec status::venus.*INSTALLED::YES
+moon::ipsec status::venus.*ESTABLISHED.*dave@strongswan.org::YES
+dave::cat /var/log/daemon.log::received TS_UNACCEPTABLE notify, no CHILD_SA built::YES
+dave::ipsec status::alice.*INSTALLED::NO
+moon::ipsec status::alice.*ESTABLISHED.*dave@strongswan.org::NO