appendfile: tidying

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

diff --git a/test/scripts/0000-Basic/0217 b/test/scripts/0000-Basic/0217
index c91d2425449b51fe711f1d4e8dd6f58a29bc59d9..db793b065a8c66052261e07259759e3a3632323a 100644 (file)
--- a/test/scripts/0000-Basic/0217
+++ b/test/scripts/0000-Basic/0217
@@ -36,7 +36,7 @@ RCPT TO
 250 OK
 *sleep 2
 ****
 250 OK
 *sleep 2
 ****

-exim -odi a b c
+exim -odi e f g

 .
 ****
 # Temp error on MAIL
 .
 ****
 # Temp error on MAIL


@@ -56,7 +56,7 @@ DATA
 QUIT
 250 OK
 ****
 QUIT
 250 OK
 ****

-exim -odi a b
+exim -odi h i

 .
 ****
 # Perm error on MAIL
 .
 ****
 # Perm error on MAIL


@@ -76,7 +76,7 @@ DATA
 QUIT
 250 OK
 ****
 QUIT
 250 OK
 ****

-exim -odi a b
+exim -odi j k

 .
 ****
 # All get temp errors
 .
 ****
 # All get temp errors


@@ -96,7 +96,7 @@ DATA
 QUIT
 250 OK
 ****
 QUIT
 250 OK
 ****

-exim -odi a b
+exim -odi l m

 .
 ****
 # All get perm errors
 .
 ****
 # All get perm errors


@@ -116,7 +116,7 @@ DATA
 QUIT
 250 OK
 ****
 QUIT
 250 OK
 ****

-exim -odi a b
+exim -odi n o

 .
 ****
 # Mixed temp and perm
 .
 ****
 # Mixed temp and perm


@@ -136,7 +136,7 @@ DATA
 QUIT
 250 OK
 ****
 QUIT
 250 OK
 ****

-exim -odi a b
+exim -odi p q

 .
 ****
 # Perm error on DATA after good recipients
 .
 ****
 # Perm error on DATA after good recipients


@@ -156,7 +156,7 @@ DATA
 QUIT
 250 OK
 ****
 QUIT
 250 OK
 ****

-exim -odi a b
+exim -odi r s

 .
 ****
 # Temp error on DATA after good recipients
 .
 ****
 # Temp error on DATA after good recipients


@@ -176,7 +176,7 @@ DATA
 QUIT
 250 OK
 ****
 QUIT
 250 OK
 ****

-exim -odi a b
+exim -odi t u

 .
 ****
 # Temp error on DATA after good recipients, but in first block of a
 .
 ****
 # Temp error on DATA after good recipients, but in first block of a


@@ -292,12 +292,310 @@ RCPT TO
 550 NO
 RCPT TO
 550 NO
 550 NO
 RCPT TO
 550 NO

+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO
+RCPT TO
+550 NO

 DATA
 403 Sorry temp data error
 QUIT
 250 OK
 ****
 DATA
 403 Sorry temp data error
 QUIT
 250 OK
 ****

-exim -v -odi a b c d e f g h i j k l m n o p q r s t u v w x y z aa bb cc dd ee ff gg hh ii jj kk ll mm nn oo pp qq rr ss tt uu vv ww xx yy zz
+exim -v -odi yes n00 n01 n02 n03 n04 n05 n06 n07 n08 n09 n10 n11 n12 n13 n14 n15 n16 n17 n18 n19 n20 n21 n22 n23 n24 n25 n26 n27 n28 n29 n30 n31 n32 n33 n34 n35 n36 n37 n38 n39 n40 n41 n42 n43 n44 n45 n46 n47 n48 n49 n50 n51 n52 n53 n54 n55 n56 n57 n58 n59 n60 n61 n62 n63 n64 n65 n66 n67 n68 n69 n70 n71 n72 n73 n74 n75 n76 n77 n78 n79 n80 n81 n82 n83 n84 n85 n86 n87 n88 n89 n90 n91 n92 n93 n94 n95 n96 n97 n98 n99 n100 n101 n102 n103 n104 n105 n106 n107 n108 n109 n110 n111 n112 n113 n114 n115 n116 n117 n118 n119 n120 n121 n122 n123 n124 n125 n126 n127 n128 n129 n130 n131 n132 n133 n134 n135 n136 n137 n138 n139 n140 n141 n142 n143 n144 n145 n146 n147 n148 n149 n150 n151 n152 n153 n154 n155 n156 n157 n158 n159 n160 n161 n162 n163 n164 n165 n166 n167 n168 n169 n170 n171 n172 n173 n174 n175 n176 n177 n178 n179 n180 n181 n182 n183 n184 n185 n186 n187 n188 n189 n190 n191 n192 n193 n194 n195 n196 n197 n198 n199

 .
 ****
 # Server drops connection after some responses
 .
 ****
 # Server drops connection after some responses


@@ -311,9 +609,373 @@ MAIL FROM
 RCPT TO
 250 OK
 RCPT TO
 RCPT TO
 250 OK
 RCPT TO

-550 NO
+550 NO
+****
+exim -odi a b c d e 
+.
+****
+# Discard retry data
+sudo rm DIR/spool/db/*
+#
+# Test hosts_avoid_pipelining
+server PORT_S
+220 Server ready
+EHLO
+250-OK
+250 PIPELINING
+MAIL FROM
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+DATA
+351 Send more
+.
+250 OK
+****
+exim -v -odi -DHAP=hosts_avoid_pipelining=127.0.0.1 w x y z
+****
+# Server says 452 excess-rcpts temp error after first 50
+# Exim client checks after 100
+sudo rm -fr DIR/spool/input
+server PORT_S
+220 Server ready
+EHLO
+250-OK
+250 PIPELINING
+MAIL FROM
+250 OK
+RCPT TO
+250 OK 0
+RCPT TO
+250 OK 1
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK 49
+RCPT TO
+452 excess 50
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess
+RCPT TO
+452 excess 99
+RCPT TO
+452 excess 100
+DATA
+354 go
+.
+250 msg accepted
+MAIL FROM
+250 good mail
+RCPT TO
+250 OK 50
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO
+250 OK
+RCPT TO:<n99
+250 OK 99-2
+RCPT TO
+452 excess 100
+DATA
+354 go
+.
+250 mesg 2 accepted
+MAIL FROM
+250 good mail
+RCPT TO
+250 OK 100
+DATA
+354 go
+.
+250 mesg 3 accepted
+QUIT
+250 OK

 ****
 ****

-exim -odi a b c d e 
+exim -odi y00 y01 y02 y03 y04 y05 y06 y07 y08 y09 y10 y11 y12 y13 y14 y15 y16 y17 y18 y19 y20 y21 y22 y23 y24 y25 y26 y27 y28 y29 y30 y31 y32 y33 y34 y35 y36 y37 y38 y39 y40 y41 y42 y43 y44 y45 y46 y47 y48 y49 n50 n51 n52 n53 n54 n55 n56 n57 n58 n59 n60 n61 n62 n63 n64 n65 n66 n67 n68 n69 n70 n71 n72 n73 n74 n75 n76 n77 n78 n79 n80 n81 n82 n83 n84 n85 n86 n87 n88 n89 n90 n91 n92 n93 n94 n95 n96 n97 n98 n99 n100

 .
 ****
 no_msglog_check
 .
 ****
 no_msglog_check