Fix environment variables replacement tests. The newest rspamd versio…

…n has a template that caused a false positive. Now only check our files in /etc/rspamd/local.d instead of all in /etc/rspamd
mailserver2 · May 24, 2024 · e01df7b · e01df7b
1 parent 603a408
commit e01df7b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/test/default.bats b/test/default.bats
@@ -41,7 +41,7 @@ load 'test_helper/bats-assert/load'
 }
 
 @test "checking system: all environment variables have been replaced (default configuration)" {
-  run docker exec mailserver_default /bin/bash -c "egrep -R -I "{{.*}}" /etc/postfix /etc/postfixadmin/fetchmail.conf /etc/dovecot /etc/rspamd /etc/cron.d /etc/mailname /usr/local/bin"
+  run docker exec mailserver_default /bin/bash -c "egrep -R -I "{{.*}}" /etc/postfix /etc/postfixadmin/fetchmail.conf /etc/dovecot /etc/rspamd/local.d /etc/cron.d /etc/mailname /usr/local/bin"
   assert_failure
 }
 

diff --git a/test/ldap.bats b/test/ldap.bats
@@ -12,7 +12,7 @@ load 'test_helper/bats-assert/load'
 }
 
 @test "checking system: all environment variables have been replaced (ldap configuration)" {
-  run docker exec mailserver_ldap /bin/bash -c "egrep -R -I "{{.*}}" /etc/postfix /etc/postfixadmin/fetchmail.conf /etc/dovecot /etc/rspamd /etc/cron.d /etc/mailname /usr/local/bin"
+  run docker exec mailserver_ldap /bin/bash -c "egrep -R -I "{{.*}}" /etc/postfix /etc/postfixadmin/fetchmail.conf /etc/dovecot /etc/rspamd/local.d /etc/cron.d /etc/mailname /usr/local/bin"
   assert_failure
 }
 

diff --git a/test/ldap2.bats b/test/ldap2.bats
@@ -6,7 +6,7 @@ load 'test_helper/bats-assert/load'
 #
 
 @test "checking system: all environment variables have been replaced (ldap2 configuration)" {
-  run docker exec mailserver_ldap2 /bin/bash -c "egrep -R -I "{{.*}}" /etc/postfix /etc/postfixadmin/fetchmail.conf /etc/dovecot /etc/rspamd /etc/cron.d /etc/mailname /usr/local/bin"
+  run docker exec mailserver_ldap2 /bin/bash -c "egrep -R -I "{{.*}}" /etc/postfix /etc/postfixadmin/fetchmail.conf /etc/dovecot /etc/rspamd/local.d /etc/cron.d /etc/mailname /usr/local/bin"
   assert_failure
 }
 

diff --git a/test/reverse.bats b/test/reverse.bats
@@ -12,7 +12,7 @@ load 'test_helper/bats-assert/load'
 }
 
 @test "checking system: all environment variables have been replaced (reverse configuration)" {
-  run docker exec mailserver_reverse /bin/bash -c "egrep -R -I "{{.*}}" /etc/postfix /etc/postfixadmin/fetchmail.conf /etc/dovecot /etc/rspamd /etc/cron.d /etc/mailname /usr/local/bin"
+  run docker exec mailserver_reverse /bin/bash -c "egrep -R -I "{{.*}}" /etc/postfix /etc/postfixadmin/fetchmail.conf /etc/dovecot /etc/rspamd/local.d /etc/cron.d /etc/mailname /usr/local/bin"
   assert_failure
 }