Skynet/misc_nixos-mailserver
7
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Update nixpkgs-unstable

Browse source 
Because of
b7749c7671
we need to `set +o pipefail` several asserts.
This commit is contained in:
Antoine Eiche 2021-06-24 21:29:23 +02:00
parent 5675b122a9
commit a9f87ca461
5 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/external.nix
View file

@ -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"):