Revert "tests use certs from src/tests/certs, not raddb/certs"

This reverts commit 5f6bcbfffae48f896e50ebb3f9cdffa529f0e9b1.

until such time as the docker images are updated to use these
tests

diff --git a/src/tests/modules/all.mk b/src/tests/modules/all.mk
index 7125a888b61e7665fc5105bd785a3bdd8005b6b0..1cfe588dbbd310c25346b50450c9099f6b19de08 100644 (file)
--- a/src/tests/modules/all.mk
+++ b/src/tests/modules/all.mk
@@ -124,3 +124,9 @@ $(foreach x,$(subst /,,$(sort $(dir $(FILES)))),$(eval $(call UNIT_TEST_MODULES,
 
 $(TEST):
        @touch $(BUILD_DIR)/tests/$@
+
+#
+#  Create the certs directory
+#
+$(DIR)/certs: $(top_srcdir)/raddb/certs
+       @ln -s $< $@

diff --git a/src/tests/modules/imap/imap_bad_tls/module.conf b/src/tests/modules/imap/imap_bad_tls/module.conf
index 5fc95b109208e02714c223e713ebfdd817f73632..726a6bd6aa3766b1e0555bd810c653d173076ccb 100644 (file)
--- a/src/tests/modules/imap/imap_bad_tls/module.conf
+++ b/src/tests/modules/imap/imap_bad_tls/module.conf
@@ -5,11 +5,11 @@ imap imap_bad_tls {
        timeout         = 1000
 
        tls {
-               ca_file                 = "src/tests/certs/certs/rsa/client.pem"
+               ca_file                 = "$ENV{top_srcdir}raddb/certs/rsa/client.pem"
 
-                       certificate_file        = "src/tests/certs/certs/rsa/client.pem" 
+                       certificate_file        = "$ENV{top_srcdir}raddb/certs/rsa/client.pem" 
  
-               private_key_file        = "src/tests/certs/certs/rsa/client.key"
+               private_key_file        = "$ENV{top_srcdir}raddb/certs/rsa/client.key"
 
                        private_key_password    = "whatever"
 

diff --git a/src/tests/modules/imap/imap_opt_tls/module.conf b/src/tests/modules/imap/imap_opt_tls/module.conf
index 9a4f81dcb6d796d6c34ea99776f609278abaf660..5f9d7dece32fce90cdf0a7dac11c545758f4dc1b 100644 (file)
--- a/src/tests/modules/imap/imap_opt_tls/module.conf
+++ b/src/tests/modules/imap/imap_opt_tls/module.conf
@@ -5,11 +5,11 @@ imap imap_try_tls {
        timeout         = 1s
 
        tls {
-               ca_file                 = "src/tests/certs/certs/rsa/ca.pem"
+               ca_file                 = "$ENV{top_srcdir}raddb/certs/rsa/ca.pem"
 
-               certificate_file        = "src/tests/certs/certs/rsa/client.pem" 
+               certificate_file        = "$ENV{top_srcdir}raddb/certs/rsa/client.pem" 
 
-               private_key_file        = "src/tests/certs/certs/rsa/client.key"
+               private_key_file        = "$ENV{top_srcdir}raddb/certs/rsa/client.key"
 
                private_key_password    = "whatever"
 

diff --git a/src/tests/modules/imap/imap_tls/module.conf b/src/tests/modules/imap/imap_tls/module.conf
index 8e86f50944baa5583c5c0da3b18fa5dae0fe2b07..e6f82f288cd4f4c236617be831789fd14d61e089 100644 (file)
--- a/src/tests/modules/imap/imap_tls/module.conf
+++ b/src/tests/modules/imap/imap_tls/module.conf
@@ -5,11 +5,11 @@ imap imap_tls {
        timeout         = 1s
 
        tls {
-               ca_file                 = "src/tests/certs/certs/rsa/ca.pem"
+               ca_file                 = "$ENV{top_srcdir}raddb/certs/rsa/ca.pem"
 
-               certificate_file        = "src/tests/certs/certs/rsa/client.pem" 
+               certificate_file        = "$ENV{top_srcdir}raddb/certs/rsa/client.pem" 
 
-               private_key_file        = "src/tests/certs/certs/rsa/client.key"
+               private_key_file        = "$ENV{top_srcdir}raddb/certs/rsa/client.key"
 
                private_key_password    = "whatever"
                 

diff --git a/src/tests/modules/rest/module.conf b/src/tests/modules/rest/module.conf
index 43bf86e769d34186027623b6c8a4ed9eab8d2c7b..9f38334c283f364bdff76ff4050f1f27d245ef83 100644 (file)
--- a/src/tests/modules/rest/module.conf
+++ b/src/tests/modules/rest/module.conf
@@ -4,11 +4,11 @@ json {
 
 rest {
        tls {
-               ca_file = "src/tests/certs/certs/rsa/ca.pem"
+               ca_file = "$ENV{top_srcdir}raddb/certs/rsa/ca.pem"
 
-               certificate_file = "src/tests/certs/certs/rsa/client.pem"
+               certificate_file = "$ENV{top_srcdir}raddb/certs/rsa/client.pem"
 
-               private_key_file = "src/tests/certs/certs/rsa/client.key"
+               private_key_file = "$ENV{top_srcdir}raddb/certs/rsa/client.key"
 
                private_key_password = "whatever"
 

diff --git a/src/tests/modules/smtp/module.conf b/src/tests/modules/smtp/module.conf
index b7b58687ec3b9487afe54b22bd9f0cbe59d35e1f..05b1449ddd401319a8d3ad7442f30a4eef1c6a3b 100644 (file)
--- a/src/tests/modules/smtp/module.conf
+++ b/src/tests/modules/smtp/module.conf
@@ -1,11 +1,11 @@
 #smtp unit test config
 smtp {
        tls {
-               ca_file = "src/tests/certs/certs/rsa/ca.pem"
+               ca_file = "$ENV{top_srcdir}raddb/certs/rsa/ca.pem"
 
-               certificate_file = "src/tests/certs/certs/rsa/client.pem"
+               certificate_file = "$ENV{top_srcdir}raddb/certs/rsa/client.pem"
 
-               private_key_file = "src/tests/certs/certs/rsa/client.key"
+               private_key_file = "$ENV{top_srcdir}raddb/certs/rsa/client.key"
 
                private_key_password = "whatever"
 

diff --git a/src/tests/modules/smtp/smtp_attachment/module.conf b/src/tests/modules/smtp/smtp_attachment/module.conf
index 331553c8303b45f3736d29fa55c7be5c948d9c59..284a4d52262e091664509f27bead453925cf7823 100644 (file)
--- a/src/tests/modules/smtp/smtp_attachment/module.conf
+++ b/src/tests/modules/smtp/smtp_attachment/module.conf
@@ -1,11 +1,11 @@
 #smtp_attachment unit test config
 smtp {
        tls {
-               ca_file = "src/tests/certs/certs/rsa/ca.pem"
+               ca_file = "$ENV{top_srcdir}raddb/certs/rsa/ca.pem"
 
-               certificate_file = "src/tests/certs/certs/rsa/client.pem"
+               certificate_file = "$ENV{top_srcdir}raddb/certs/rsa/client.pem"
 
-               private_key_file = "src/tests/certs/certs/rsa/client.key"
+               private_key_file = "$ENV{top_srcdir}raddb/certs/rsa/client.key"
 
                private_key_password = "whatever"
 

diff --git a/src/tests/modules/smtp/smtp_authenticate/module.conf b/src/tests/modules/smtp/smtp_authenticate/module.conf
index 7ebd08e187eb2d4a7ec9e5c63870806099d4e7fc..4136a046cf144e3ba3562c595486120ad84a54b0 100644 (file)
--- a/src/tests/modules/smtp/smtp_authenticate/module.conf
+++ b/src/tests/modules/smtp/smtp_authenticate/module.conf
@@ -6,11 +6,11 @@ smtp {
        template_directory = "$ENV{top_srcdir}build/ci/exim4/"
 
        tls {
-               ca_file = "src/tests/certs/certs/rsa/ca.pem"
+               ca_file = "$ENV{top_srcdir}raddb/certs/rsa/ca.pem"
 
-               certificate_file = "src/tests/certs/certs/rsa/client.pem"
+               certificate_file = "$ENV{top_srcdir}raddb/certs/rsa/client.pem"
 
-               private_key_file = "src/tests/certs/certs/rsa/client.key"
+               private_key_file = "$ENV{top_srcdir}raddb/certs/rsa/client.key"
 
                private_key_password = "whatever"
 

diff --git a/src/tests/modules/smtp/smtp_crln/module.conf b/src/tests/modules/smtp/smtp_crln/module.conf
index f65cc85d77207b6b842fadeb0e07b50f3370a072..cb2e30e2f0126870a50dd0e7ffdb04723f174870 100644 (file)
--- a/src/tests/modules/smtp/smtp_crln/module.conf
+++ b/src/tests/modules/smtp/smtp_crln/module.conf
@@ -2,11 +2,11 @@
 
 smtp {
        tls {
-               ca_file = "src/tests/certs/certs/rsa/ca.pem"
+               ca_file = "$ENV{top_srcdir}raddb/certs/rsa/ca.pem"
 
-               certificate_file = "src/tests/certs/certs/rsa/client.pem"
+               certificate_file = "$ENV{top_srcdir}raddb/certs/rsa/client.pem"
 
-               private_key_file = "src/tests/certs/certs/rsa/client.key"
+               private_key_file = "$ENV{top_srcdir}raddb/certs/rsa/client.key"
 
                private_key_password = "whatever"
 

diff --git a/src/tests/modules/smtp/smtp_stringparse/module.conf b/src/tests/modules/smtp/smtp_stringparse/module.conf
index c2d8886a46794189a6c6f76f9d536f5122067ed5..f3aa548c1ce62e20011573f279efb28a40ae972a 100644 (file)
--- a/src/tests/modules/smtp/smtp_stringparse/module.conf
+++ b/src/tests/modules/smtp/smtp_stringparse/module.conf
@@ -2,11 +2,11 @@
 
 smtp {
        tls {
-               ca_file = "src/tests/certs/certs/rsa/ca.pem"
+               ca_file = "$ENV{top_srcdir}raddb/certs/rsa/ca.pem"
 
-               certificate_file = "src/tests/certs/certs/rsa/client.pem"
+               certificate_file = "$ENV{top_srcdir}raddb/certs/rsa/client.pem"
 
-               private_key_file = "src/tests/certs/certs/rsa/client.key"
+               private_key_file = "$ENV{top_srcdir}raddb/certs/rsa/client.key"
 
                private_key_password = "whatever"