From 86b48f368f665c3ddc5421ec4d99f9d0d2555fda Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 7 May 2025 03:55:17 +0200 Subject: [PATCH] tests: remove invalid escape sequences >>> "\@" :1: SyntaxWarning: invalid escape sequence '\@' '\\@' --- tests/clamav.nix | 2 +- tests/external.nix | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tests/clamav.nix b/tests/clamav.nix index ae186df..71061a2 100644 --- a/tests/clamav.nix +++ b/tests/clamav.nix @@ -222,7 +222,7 @@ pkgs.nixosTest { with subtest("virus scan email"): client.succeed( - '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' + '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 c7e9a0d..15ea3b2 100644 --- a/tests/external.nix +++ b/tests/external.nix @@ -272,7 +272,7 @@ pkgs.nixosTest { To: Chuck Cc: Bcc: - Subject: This is a test Email from postmaster\@example.com to chuck + Subject: This is a test Email from postmaster@example.com to chuck Reply-To: Hello Chuck, @@ -286,7 +286,7 @@ pkgs.nixosTest { To: User1 Cc: Bcc: - Subject: This is a test Email from single-alias\@example.com to user1 + Subject: This is a test Email from single-alias@example.com to user1 Reply-To: Hello User1, @@ -301,7 +301,7 @@ pkgs.nixosTest { To: Multi Alias Cc: Bcc: - Subject: This is a test Email from user2\@example.com to multi-alias + Subject: This is a test Email from user2@example.com to multi-alias Reply-To: Hello Multi Alias, @@ -367,7 +367,7 @@ pkgs.nixosTest { with subtest("submission port send mail"): # send email from user2 to user1 client.succeed( - "msmtp -a test --tls=on --tls-certcheck=off --auth=on user1\@example.com < /etc/root/email1 >&2" + "msmtp -a test --tls=on --tls-certcheck=off --auth=on user1@example.com < /etc/root/email1 >&2" ) # give the mail server some time to process the mail server.wait_until_fails('[ "$(postqueue -p)" != "Mail queue is empty" ]') @@ -395,7 +395,7 @@ pkgs.nixosTest { client.execute("rm ~/mail/*") # send email from user2 to user1 client.succeed( - "msmtp -a test2 --tls=on --tls-certcheck=off --auth=on user1\@example.com < /etc/root/email2 >&2" + "msmtp -a test2 --tls=on --tls-certcheck=off --auth=on user1@example.com < /etc/root/email2 >&2" ) server.wait_until_fails('[ "$(postqueue -p)" != "Mail queue is empty" ]') # fetchmail returns EXIT_CODE 0 when it retrieves mail @@ -408,7 +408,7 @@ pkgs.nixosTest { client.execute("rm ~/mail/*") # send email from chuck to postmaster client.succeed( - "msmtp -a test3 --tls=on --tls-certcheck=off --auth=on postmaster\@example.com < /etc/root/email2 >&2" + "msmtp -a test3 --tls=on --tls-certcheck=off --auth=on postmaster@example.com < /etc/root/email2 >&2" ) server.wait_until_fails('[ "$(postqueue -p)" != "Mail queue is empty" ]') # fetchmail returns EXIT_CODE 0 when it retrieves mail @@ -418,7 +418,7 @@ pkgs.nixosTest { client.execute("rm ~/mail/*") # send email from chuck to non exsitent account client.succeed( - "msmtp -a test3 --tls=on --tls-certcheck=off --auth=on lol\@example.com < /etc/root/email2 >&2" + "msmtp -a test3 --tls=on --tls-certcheck=off --auth=on lol@example.com < /etc/root/email2 >&2" ) server.wait_until_fails('[ "$(postqueue -p)" != "Mail queue is empty" ]') # fetchmail returns EXIT_CODE 0 when it retrieves mail @@ -427,7 +427,7 @@ pkgs.nixosTest { client.execute("rm ~/mail/*") # send email from user1 to chuck client.succeed( - "msmtp -a test4 --tls=on --tls-certcheck=off --auth=on chuck\@example.com < /etc/root/email2 >&2" + "msmtp -a test4 --tls=on --tls-certcheck=off --auth=on chuck@example.com < /etc/root/email2 >&2" ) server.wait_until_fails('[ "$(postqueue -p)" != "Mail queue is empty" ]') # fetchmail returns EXIT_CODE 1 when no new mail @@ -438,7 +438,7 @@ pkgs.nixosTest { client.execute("rm ~/mail/*") # send email from single-alias to user1 client.succeed( - "msmtp -a test5 --tls=on --tls-certcheck=off --auth=on user1\@example.com < /etc/root/email4 >&2" + "msmtp -a test5 --tls=on --tls-certcheck=off --auth=on user1@example.com < /etc/root/email4 >&2" ) server.wait_until_fails('[ "$(postqueue -p)" != "Mail queue is empty" ]') # fetchmail returns EXIT_CODE 0 when it retrieves mail @@ -447,7 +447,7 @@ pkgs.nixosTest { client.execute("rm ~/mail/*") # send email from user1 to multi-alias (user{1,2}@example.com) client.succeed( - "msmtp -a test --tls=on --tls-certcheck=off --auth=on multi-alias\@example.com < /etc/root/email5 >&2" + "msmtp -a test --tls=on --tls-certcheck=off --auth=on multi-alias@example.com < /etc/root/email5 >&2" ) server.wait_until_fails('[ "$(postqueue -p)" != "Mail queue is empty" ]') # fetchmail returns EXIT_CODE 0 when it retrieves mail @@ -458,7 +458,7 @@ pkgs.nixosTest { client.execute("mv ~/.fetchmailRcLowQuota ~/.fetchmailrc") client.succeed( - "msmtp -a test3 --tls=on --tls-certcheck=off --auth=on lowquota\@example.com < /etc/root/email2 >&2" + "msmtp -a test3 --tls=on --tls-certcheck=off --auth=on lowquota@example.com < /etc/root/email2 >&2" ) server.wait_until_fails('[ "$(postqueue -p)" != "Mail queue is empty" ]') # fetchmail returns EXIT_CODE 0 when it retrieves mail @@ -467,7 +467,7 @@ pkgs.nixosTest { with subtest("imap sieve junk trainer"): # send email from user2 to user1 client.succeed( - "msmtp -a test --tls=on --tls-certcheck=off --auth=on user1\@example.com < /etc/root/email1 >&2" + "msmtp -a test --tls=on --tls-certcheck=off --auth=on user1@example.com < /etc/root/email1 >&2" ) # give the mail server some time to process the mail server.wait_until_fails('[ "$(postqueue -p)" != "Mail queue is empty" ]') @@ -480,10 +480,10 @@ pkgs.nixosTest { with subtest("full text search and indexation"): # send 2 email from user2 to user1 client.succeed( - "msmtp -a test --tls=on --tls-certcheck=off --auth=on user1\@example.com < /etc/root/email6 >&2" + "msmtp -a test --tls=on --tls-certcheck=off --auth=on user1@example.com < /etc/root/email6 >&2" ) client.succeed( - "msmtp -a test --tls=on --tls-certcheck=off --auth=on user1\@example.com < /etc/root/email7 >&2" + "msmtp -a test --tls=on --tls-certcheck=off --auth=on user1@example.com < /etc/root/email7 >&2" ) # give the mail server some time to process the mail server.wait_until_fails('[ "$(postqueue -p)" != "Mail queue is empty" ]')