summaryrefslogtreecommitdiff
path: root/test/scripts
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2016-12-03 23:07:12 +0000
committerJeremy Harris <jgh146exb@wizmail.org>2016-12-03 23:07:12 +0000
commitc7769c138e23836dc162972ff52fa41aa3fd9f54 (patch)
treecea2b985c966011b5ae5804811606f45a89de920 /test/scripts
parent12373afb257c7db03a2f46fd8498aa4e8287b68a (diff)
Testsuite: ensure delivery order
Diffstat (limited to 'test/scripts')
-rw-r--r--test/scripts/0000-Basic/057030
1 files changed, 19 insertions, 11 deletions
diff --git a/test/scripts/0000-Basic/0570 b/test/scripts/0000-Basic/0570
index 75ac0cec6..8f8c0b2da 100644
--- a/test/scripts/0000-Basic/0570
+++ b/test/scripts/0000-Basic/0570
@@ -12,7 +12,7 @@ exim -q
****
#
#
-exim userx@domA.ex usery@domB.ex
+exim userx@domC.ex usery@domD.ex
Test message
****
# Equivalent explicit case: can multi-domain
@@ -20,14 +20,17 @@ exim -DOPTION=multi_domain=yes -q
****
#
#
-exim userx@domA.ex usery@domB.ex
+exim userx@domE.ex usery@domF.ex
Test message
****
-# no multi-domain
+# no multi-domain: 2nd rcpt is deferred since parallel is disabled
exim -DOPTION=multi_domain=no -q
+****
+exim -DOPTION=multi_domain=no -qf
+****
#
#
-exim userx@domA.ex usery@domB.ex
+exim userx@domG.ex usery@domH.ex
Test message
****
# Expanded case: can multi-domain
@@ -35,33 +38,38 @@ exim -DOPTION='multi_domain=${if bool{1} {true}{false}}' -q
****
#
#
-exim userx@domA.ex usery@domB.ex
+exim userx@domK.ex usery@domL.ex
Test message
****
# Expanded case: no multi-domain (1)
-exim -DOPTION='multi_domain=${if eqi {$address_data}{domA.ex} {no}{yes}}' -q
+exim -DOPTION='multi_domain=${if eqi {$address_data}{domK.ex} {no}{yes}}' -q
+****
+exim -DOPTION='multi_domain=${if eqi {$address_data}{domK.ex} {no}{yes}}' -qf
****
#
#
-exim userx@domA.ex usery@domB.ex
+exim userx@domM.ex usery@domN.ex
Test message
****
# Expanded case: no multi-domain (2)
-exim -DOPTION='multi_domain=${if match_domain {$address_data}{domZ.ex : domY.ex : domB.ex} {no}{yes}}' -q
+exim -DOPTION='multi_domain=${if match_domain {$address_data}{domZ.ex : domY.ex : domN.ex} {no}{yes}}' -q
+****
+exim -DOPTION='multi_domain=${if match_domain {$address_data}{domZ.ex : domY.ex : domN.ex} {no}{yes}}' -qf
****
#
#
-exim userx@domA.ex usery@domA.ex userz@domC.ex
+exim userx@domP.ex usery@domP.ex userz@domQ.ex
Test message
****
# Expanded case: both yes and no
-exim -DOPTION='multi_domain=${if eqi {$address_data}{domA.ex} {no}{yes}}' -q
+exim -DOPTION='multi_domain=${if eqi {$address_data}{domP.ex} {no}{yes}}' -q
+****
+exim -DOPTION='multi_domain=${if eqi {$address_data}{domP.ex} {no}{yes}}' -qf
****
#
#
killdaemon
no_msglog_check
-sortlog
#
#
##