diff options
author | Antoine Eiche <lewo@abesis.fr> | 2021-06-24 21:29:23 +0200 |
---|---|---|
committer | Antoine Eiche <lewo@abesis.fr> | 2021-06-24 23:02:58 +0200 |
commit | a9f87ca461a1f0e23e85a1ba8c696672ed9e11e2 (patch) | |
tree | 7d63cb5d010257a339b453619aaa88291332e28f /tests | |
parent | 5675b122a947b40e551438df6a623efad19fd2e7 (diff) |
Update nixpkgs-unstableupdate-nixpkgs-unstable
Because of
https://github.com/NixOS/nixpkgs/commit/b7749c76715ba96727f7a12bc2514ddfa6847813
we need to `set +o pipefail` several asserts.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/clamav.nix | 8 | ||||
-rw-r--r-- | tests/external.nix | 6 | ||||
-rw-r--r-- | tests/internal.nix | 4 | ||||
-rw-r--r-- | tests/multiple.nix | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/tests/clamav.nix b/tests/clamav.nix index f62df58..f818991 100644 --- a/tests/clamav.nix +++ b/tests/clamav.nix @@ -196,10 +196,10 @@ pkgs.nixosTest { # TODO put this blocking into the systemd units? I am not sure if rspamd already waits for the clamd socket. server.wait_until_succeeds( - "timeout 1 ${nodes.server.pkgs.netcat}/bin/nc -U /run/rspamd/rspamd-milter.sock < /dev/null; [ $? -eq 124 ]" + "set +e; timeout 1 ${nodes.server.pkgs.netcat}/bin/nc -U /run/rspamd/rspamd-milter.sock < /dev/null; [ $? -eq 124 ]" ) server.wait_until_succeeds( - "timeout 1 ${nodes.server.pkgs.netcat}/bin/nc -U /run/clamav/clamd.ctl < /dev/null; [ $? -eq 124 ]" + "set +e; timeout 1 ${nodes.server.pkgs.netcat}/bin/nc -U /run/clamav/clamd.ctl < /dev/null; [ $? -eq 124 ]" ) client.execute("cp -p /etc/root/.* ~/") @@ -224,12 +224,12 @@ pkgs.nixosTest { with subtest("virus scan file"): server.succeed( - 'clamdscan $(readlink -f /etc/root/eicar.com.txt) | grep "Txt\\.Malware\\.Agent-1787597 FOUND" >&2' + 'set +o pipefail; clamdscan $(readlink -f /etc/root/eicar.com.txt) | grep "Txt\\.Malware\\.Agent-1787597 FOUND" >&2' ) with subtest("virus scan email"): client.succeed( - 'msmtp -a user2 user1\@example.com < /etc/root/virus-email 2>&1 | tee /dev/stderr | grep "server message: 554 5\\.7\\.1" >&2' + 'set +o pipefail; msmtp -a user2 user1\@example.com < /etc/root/virus-email 2>&1 | tee /dev/stderr | grep "server message: 554 5\\.7\\.1" >&2' ) server.succeed("journalctl -u rspamd | grep -i eicar") # give the mail server some time to process the mail diff --git a/tests/external.nix b/tests/external.nix index f453608..55d9eb5 100644 --- a/tests/external.nix +++ b/tests/external.nix @@ -345,7 +345,7 @@ pkgs.nixosTest { # TODO put this blocking into the systemd units? server.wait_until_succeeds( - "timeout 1 ${nodes.server.pkgs.netcat}/bin/nc -U /run/rspamd/rspamd-milter.sock < /dev/null; [ $? -eq 124 ]" + "set +e; timeout 1 ${nodes.server.pkgs.netcat}/bin/nc -U /run/rspamd/rspamd-milter.sock < /dev/null; [ $? -eq 124 ]" ) client.execute("cp -p /etc/root/.* ~/") @@ -489,11 +489,11 @@ pkgs.nixosTest { client.fail("search Junk a >&2") # check that search really goes through the indexer server.succeed( - "journalctl -u dovecot2 | grep -E 'indexer-worker.*Indexed . messages in INBOX' >&2" + "journalctl -u dovecot2 | grep -E 'indexer-worker.* Mailbox INBOX: Indexed' >&2" ) # check that Junk is not indexed server.fail( - "journalctl -u dovecot2 | grep -E 'indexer-worker.*Indexed . messages in Junk' >&2" + "journalctl -u dovecot2 | grep -E 'indexer-worker.* Mailbox JUNK: Indexed' >&2" ) with subtest("no warnings or errors"): diff --git a/tests/internal.nix b/tests/internal.nix index 12590c0..c64339a 100644 --- a/tests/internal.nix +++ b/tests/internal.nix @@ -133,7 +133,7 @@ pkgs.nixosTest { machine.wait_for_open_port(25) # TODO put this blocking into the systemd units machine.wait_until_succeeds( - "timeout 1 ${pkgs.netcat}/bin/nc -U /run/rspamd/rspamd-milter.sock < /dev/null; [ $? -eq 124 ]" + "set +e; timeout 1 ${pkgs.netcat}/bin/nc -U /run/rspamd/rspamd-milter.sock < /dev/null; [ $? -eq 124 ]" ) machine.succeed( "cat ${sendMail} | ${pkgs.netcat-gnu}/bin/nc localhost 25 | grep -q 'This account cannot receive emails'" @@ -141,7 +141,7 @@ pkgs.nixosTest { with subtest("rspamd controller serves web ui"): machine.succeed( - "${pkgs.curl}/bin/curl --unix-socket /run/rspamd/worker-controller.sock http://localhost/ | grep -q '<body>'" + "set +o pipefail; ${pkgs.curl}/bin/curl --unix-socket /run/rspamd/worker-controller.sock http://localhost/ | grep -q '<body>'" ) with subtest("imap port 143 is closed and imaps is serving SSL"): diff --git a/tests/multiple.nix b/tests/multiple.nix index 9f54cff..3377906 100644 --- a/tests/multiple.nix +++ b/tests/multiple.nix @@ -68,10 +68,10 @@ pkgs.nixosTest { # TODO put this blocking into the systemd units? domain1.wait_until_succeeds( - "timeout 1 ${pkgs.netcat}/bin/nc -U /run/rspamd/rspamd-milter.sock < /dev/null; [ $? -eq 124 ]" + "set +e; timeout 1 ${pkgs.netcat}/bin/nc -U /run/rspamd/rspamd-milter.sock < /dev/null; [ $? -eq 124 ]" ) domain2.wait_until_succeeds( - "timeout 1 ${pkgs.netcat}/bin/nc -U /run/rspamd/rspamd-milter.sock < /dev/null; [ $? -eq 124 ]" + "set +e; timeout 1 ${pkgs.netcat}/bin/nc -U /run/rspamd/rspamd-milter.sock < /dev/null; [ $? -eq 124 ]" ) # user@domain1.com sends a mail to user@domain2.com |