testsuite: tidying

[users/jgh/exim.git] / test / scripts / 0000-Basic / 0570

diff --git a/test/scripts/0000-Basic/0570 b/test/scripts/0000-Basic/0570
index ed54afc1d61171e116c257ec0c31e83b06f7e807..8f8c0b2da2be8d923cdc843e05cd669ccb46ec4d 100644 (file)
--- 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
 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
 ****
 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 -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
 Test message
 ****
 # Expanded case: can multi-domain


@@ -35,27 +38,33 @@ 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)
 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)
 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
 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

 ****
 #
 #
 ****
 #
 #