[Test] Use unique envelope senders in aliases From tests

The three From-identity tests shared one envelope From/Rcpt pair, so the
greylist module (meta key = envelope from + rcpts + ip) soft-rejected
the third scan of the pair within its retry window, skipping the filters
stage and losing the GET_FROM symbol. This only manifested with tight
test pacing (pabot shard in CI); give each test a unique envelope
sender, as the rest of the suite does.

diff --git a/test/functional/cases/001_merged/360_aliases.robot b/test/functional/cases/001_merged/360_aliases.robot
index a341ab55964d35deb64d2e8e8f77aae32a0ac4ed..edd227fe4171e2b0422aaf9c96414b5221fab585 100644 (file)
--- a/test/functional/cases/001_merged/360_aliases.robot
+++ b/test/functional/cases/001_merged/360_aliases.robot
@@ -160,9 +160,11 @@ FROM AND RCPT TAGGED
 GOOGLEMAIL FROM - DOMAIN PRESERVED
   [Documentation]  Gmail user-part rules apply to googlemail.com, but the
   ...  domain must not be rewritten to gmail.com: the two are DNS-distinct
-  ...  and publish different SPF/DMARC records
+  ...  and publish different SPF/DMARC records.
+  ...  Note: each test needs a unique envelope From/Rcpt pair, otherwise the
+  ...  greylist module soft-rejects the repeated pair and skips the filters
   Scan File  ${RSPAMD_TESTDIR}/messages/aliases_googlemail.eml
-  ...  From=sender@external.com
+  ...  From=sender-gm@external.com
   ...  Rcpt=user@example.com
   Expect Symbol  ALIAS_RESOLVED
   Expect Symbol With Exact Options  GET_FROM  First Last,firstlast@googlemail.com,firstlast,googlemail.com
@@ -171,7 +173,7 @@ FROM CROSS-DOMAIN ALIAS - NOT APPLIED
   [Documentation]  Alias resolution that would change the From domain must be
   ...  discarded: the From domain is an authentication identifier
   Scan File  ${RSPAMD_TESTDIR}/messages/aliases_from_virtual.eml
-  ...  From=sender@external.com
+  ...  From=sender-vx@external.com
   ...  Rcpt=user@example.com
   Do Not Expect Symbol  ALIAS_RESOLVED
   Expect Symbol With Exact Options  GET_FROM  Virtual Sender,virtual@example.com,virtual,example.com
@@ -180,7 +182,7 @@ FROM SAME-DOMAIN ALIAS - APPLIED
   [Documentation]  Same-domain alias resolution of the From local part is
   ...  still allowed
   Scan File  ${RSPAMD_TESTDIR}/messages/aliases_from_unix.eml
-  ...  From=sender@external.com
+  ...  From=sender-ux@external.com
   ...  Rcpt=user@example.com
   Expect Symbol  ALIAS_RESOLVED
   Expect Symbol With Exact Options  GET_FROM  Abuse Desk,admin@example.com,admin,example.com