[Test] Partially fix tests

diff --git a/test/functional/cases/410_replies.robot b/test/functional/cases/410_replies.robot
index e75bad9cb003573f5d9185e7d3111a512826cd55..29faf581e3b77103bdd85eed8cefff718672d039 100644 (file)
--- a/test/functional/cases/410_replies.robot
+++ b/test/functional/cases/410_replies.robot
@@ -15,28 +15,45 @@ ${RSPAMD_SCOPE}        Suite
 *** Test Cases ***
 Reply to 1 sender 1 recipients
   Scan File  ${RSPAMD_TESTDIR}/messages/set_replyto_1_1.eml
-  ...  IP=8.8.8.8  User=user@emailbl.com
+  ...  IP=8.8.8.8
+  ...  User=xxx@abrakadabra.com
+  ...  From=xxx@abrakadabra.com
   ...  Settings=${SETTINGS_REPLIES}
+  ...  Rcpt=user@emailbl.com
   Scan File  ${RSPAMD_TESTDIR}/messages/replyto_1_1.eml
-  ...  IP=8.8.8.8  User=user@emailbl.com  Rcpt=xxx@abrakadabra.com
+  ...  IP=8.8.8.8
+  ...  Rcpt=xxx@abrakadabra.com
   ...  Settings=${SETTINGS_REPLIES}
+  ...  From=user@emailbl.com
   Expect Symbol  ${SYMBOL}
 
 Reply to 1 sender 2 recipients but SMTP recipient matches
   Scan File  ${RSPAMD_TESTDIR}/messages/set_replyto_1_2_first.eml
-  ...  IP=8.8.8.8  User=user@emailbl.com
+  ...  IP=8.8.8.8
+  ...  User=xxxx@emailbl.com
   ...  Settings=${SETTINGS_REPLIES}
   Scan File  ${RSPAMD_TESTDIR}/messages/replyto_1_2.eml
-  ...  IP=8.8.8.8  User=user@emailbl.com  Rcpt=xxxx@emailbl.com
+  ...  IP=8.8.8.8
+  ...  Rcpt=xxxx@emailbl.com
   ...  Settings=${SETTINGS_REPLIES}
   Expect Symbol  ${SYMBOL}
 
-Reply to 1 sender 2 recipients but SMTP recipient NOT matches
-  Scan File  ${RSPAMD_TESTDIR}/messages/set_replyto_1_2_first.eml
-  ...  IP=8.8.8.8  User=user@emailbl.com
-  ...  Settings=${SETTINGS_REPLIES}
-  Scan File  ${RSPAMD_TESTDIR}/messages/replyto_1_2.eml
-  ...  IP=8.8.8.8  User=user@emailbl.com  Rcpt=another@emailbl.com
+Reply to 1 sender 2 recipients 1 rcpt is same
+  Scan File  ${RSPAMD_TESTDIR}/messages/replyto_1_2_s.eml
+  ...  IP=8.8.8.8
+  ...  Rcpt=xxxx@emailbl.com
+  ...  Rcpt=llll@emailbl.com
   ...  Settings=${SETTINGS_REPLIES}
-  Do Not Expect Symbol  ${SYMBOL}
+  Expect Symbol  ${SYMBOL}
 
+Reply to another sender 2 recipients
+  Scan File  ${RSPAMD_TESTDIR}/messages/set_replyto_2_2.eml
+  ...  IP=8.8.8.8
+  ...  User=xxxx@emailbl.com
+  ...  Settings=${SETTINGS_REPLIES}
+  Scan File  ${RSPAMD_TESTDIR}/messages/replyto_2_2.eml
+  ...  IP=8.8.8.8  User=another@emailbl.com
+  ...  Settings=${SETTINGS_REPLIES}
+  ...  Rcpt=asdf@emailbl.com
+  ...  Rcpt=xxxx@emailbl.com
+  Expect Symbol  ${SYMBOL}