preisi/mailnix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tests: rspamd: Fix sieve tests

Browse source 
Currently, the sieve tests only check whether the sieve scripts were
invoked. However, they could still fail due to wrong permissions, etc.
This commit enables additional logging output for dovecot2 and refines
the sieve tests to check for error messages.
This commit is contained in:
Thomas Preisner 2025-08-10 18:34:36 +02:00
parent 27d388e1c8
commit f5bf117314
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
tests/common/server.nix
View file

@ -1,4 +1,4 @@
{...}: { {lib, ...}: {
imports = [./../../mailsystem]; imports = [./../../mailsystem];
config = { config = {
virtualisation.memorySize = 1024; virtualisation.memorySize = 1024;
@ -6,5 +6,12 @@
enable = true; enable = true;
certificateScheme = "selfsigned"; certificateScheme = "selfsigned";
}; };
# Enable more verbose logging (required for, e.g., sieve testing)
services.dovecot2.extraConfig = lib.mkAfter ''
mail_debug = yes
auth_debug = yes
verbose_ssl = yes
'';
}; };
} }

3
tests/rspamd.nix
View file

@ -152,8 +152,11 @@ in
client.succeed("${test-mark-spam "normal2"} >&2") client.succeed("${test-mark-spam "normal2"} >&2")
server.wait_until_succeeds("journalctl -u dovecot2 | grep -i learn-spam.sh >&2") server.wait_until_succeeds("journalctl -u dovecot2 | grep -i learn-spam.sh >&2")
server.fail("journalctl -u dovecot2 | grep -i learn-spam.sh | grep -i error >&2")
client.succeed("${test-mark-ham "normal2"} >&2") client.succeed("${test-mark-ham "normal2"} >&2")
server.wait_until_succeeds("journalctl -u dovecot2 | grep -i learn-ham.sh >&2") server.wait_until_succeeds("journalctl -u dovecot2 | grep -i learn-ham.sh >&2")
server.fail("journalctl -u dovecot2 | grep -i learn-ham.sh | grep -i error >&2")
with subtest("dkim signing"): with subtest("dkim signing"):
client.succeed("${sendMail "normal2" "" accounts."normal".address '' client.succeed("${sendMail "normal2" "" accounts."normal".address ''