aither/simple-nixos-mailserver
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tests: migrate to wait_for_open_unix_socket helper

Browse Source
This commit is contained in:
Martin Weinelt
2026-04-18 23:04:09 +02:00
parent e4017308b2
commit 25fae6f36e
5 changed files with 7 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/clamav.nix
+2 -7
View File
@@ -210,13 +210,8 @@
server.wait_for_unit("multi-user.target") server.wait_for_unit("multi-user.target")
client.wait_for_unit("multi-user.target") client.wait_for_unit("multi-user.target")
# TODO put this blocking into the systemd units? I am not sure if rspamd already waits for the clamd socket. server.wait_for_open_unix_socket("/run/rspamd/rspamd-milter.sock")
server.wait_until_succeeds( server.wait_for_open_unix_socket("/run/clamav/clamd.ctl")
"set +e; timeout 1 nc -U /run/rspamd/rspamd-milter.sock < /dev/null; [ $? -eq 124 ]"
)
server.wait_until_succeeds(
"set +e; timeout 1 nc -U /run/clamav/clamd.ctl < /dev/null; [ $? -eq 124 ]"
)
client.execute("cp -p /etc/root/.* ~/") client.execute("cp -p /etc/root/.* ~/")
client.succeed("mkdir -p ~/mail") client.succeed("mkdir -p ~/mail")
tests/external.nix
+1 -4
View File
@@ -403,10 +403,7 @@
server.wait_for_unit("multi-user.target") server.wait_for_unit("multi-user.target")
client.wait_for_unit("multi-user.target") client.wait_for_unit("multi-user.target")
# TODO put this blocking into the systemd units? server.wait_for_open_unix_socket("/run/rspamd/rspamd-milter.sock")
server.wait_until_succeeds(
"set +e; timeout 1 nc -U /run/rspamd/rspamd-milter.sock < /dev/null; [ $? -eq 124 ]"
)
server.succeed("rspamadm dkim_keygen > /run/rspamd/dkim-test.key") server.succeed("rspamadm dkim_keygen > /run/rspamd/dkim-test.key")
server.succeed("chown rspamd: /run/rspamd/dkim-test.key") server.succeed("chown rspamd: /run/rspamd/dkim-test.key")
tests/internal.nix
+1 -4
View File
@@ -131,10 +131,7 @@ in
machine.wait_for_unit("multi-user.target") machine.wait_for_unit("multi-user.target")
machine.wait_for_unit("dovecot.service") machine.wait_for_unit("dovecot.service")
# TODO put this blocking into the systemd units? machine.wait_for_open_unix_socket("/run/rspamd/rspamd-milter.sock")
machine.wait_until_succeeds(
"set +e; timeout 1 nc -U /run/rspamd/rspamd-milter.sock < /dev/null; [ $? -eq 124 ]"
)
# Regression test for https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/issues/205 # Regression test for https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/issues/205
with subtest("mail forwarded can are locally kept"): with subtest("mail forwarded can are locally kept"):
tests/ldap.nix
+1 -4
View File
@@ -181,10 +181,7 @@ in
# if the schema is broken, fail fast. helps during development. # if the schema is broken, fail fast. helps during development.
machine.wait_for_unit("openldap.service") machine.wait_for_unit("openldap.service")
# TODO put this blocking into the systemd units? machine.wait_for_open_unix_socket("/run/rspamd/rspamd-milter.sock")
machine.wait_until_succeeds(
"set +e; timeout 1 nc -U /run/rspamd/rspamd-milter.sock < /dev/null; [ $? -eq 124 ]"
)
# This function retrieves the ldap table file from a postconf # This function retrieves the ldap table file from a postconf
# command. # command.
tests/multiple.nix
+2 -7
View File
@@ -99,13 +99,8 @@ in
domain.wait_for_unit("multi-user.target") domain.wait_for_unit("multi-user.target")
domain.wait_for_unit("dovecot.service") domain.wait_for_unit("dovecot.service")
# TODO put this blocking into the systemd units? for host in [domain1, domain2]:
domain1.wait_until_succeeds( host.wait_for_open_unix_socket("/run/rspamd/rspamd-milter.sock")
"set +e; timeout 1 nc -U /run/rspamd/rspamd-milter.sock < /dev/null; [ $? -eq 124 ]"
)
domain2.wait_until_succeeds(
"set +e; timeout 1 nc -U /run/rspamd/rspamd-milter.sock < /dev/null; [ $? -eq 124 ]"
)
# user@domain1.com sends a mail to user@domain2.com via explicit TLS # user@domain1.com sends a mail to user@domain2.com via explicit TLS
client.succeed( client.succeed(