tests: remove trailing spaces in server responses

Allows us to drop lots of %spc% from test cases making them easier on
the eye.

Closes #19374

diff --git a/tests/data/test1349 b/tests/data/test1349
index da34bcf87c169f54b368fceb9195f03fa2c0427b..faf1260c2824658536f0db88a450c1752752869c 100644 (file)
--- a/tests/data/test1349
+++ b/tests/data/test1349
@@ -49,10 +49,10 @@ mooo
 # The final "221 bye bye baby" response to QUIT will not be recorded
 # since that is not considered part of this particular transfer!
 <file2 name="%LOGDIR/heads%TESTNUMBER" crlf="yes">
-220-        _   _ ____  _%spc%%spc%%spc%%spc%%spc%
-220-    ___| | | |  _ \| |%spc%%spc%%spc%%spc%
-220-   / __| | | | |_) | |%spc%%spc%%spc%%spc%
-220-  | (__| |_| |  _ {| |___%spc%
+220-        _   _ ____  _
+220-    ___| | | |  _ \| |
+220-   / __| | | | |_) | |
+220-  | (__| |_| |  _ {| |___
 220    \___|\___/|_| \_\_____|
 331 We are happy you popped in!
 230 Welcome you silly person

diff --git a/tests/data/test1350 b/tests/data/test1350
index a795a0bd32682399a1edb4307c91bb325628d1d8..9fd7f897857aec93b99cc4ce0eebee781c1d4df2 100644 (file)
--- a/tests/data/test1350
+++ b/tests/data/test1350
@@ -49,10 +49,10 @@ mooo
 # The final "221 bye bye baby" response to QUIT will not be recorded
 # since that is not considered part of this particular transfer!
 <file2 name="%LOGDIR/stdout%TESTNUMBER" crlf="yes">
-220-        _   _ ____  _%spc%%spc%%spc%%spc%%spc%
-220-    ___| | | |  _ \| |%spc%%spc%%spc%%spc%
-220-   / __| | | | |_) | |%spc%%spc%%spc%%spc%
-220-  | (__| |_| |  _ {| |___%spc%
+220-        _   _ ____  _
+220-    ___| | | |  _ \| |
+220-   / __| | | | |_) | |
+220-  | (__| |_| |  _ {| |___
 220    \___|\___/|_| \_\_____|
 331 We are happy you popped in!
 230 Welcome you silly person

diff --git a/tests/data/test1351 b/tests/data/test1351
index 99625533ec3bf3b03dea4b03c0a3e66989cf0237..139537e378c641cabf30aec3789c203624dbf189 100644 (file)
--- a/tests/data/test1351
+++ b/tests/data/test1351
@@ -50,10 +50,10 @@ mooo
 # The final "221 bye bye baby" response to QUIT will not be recorded
 # since that is not considered part of this particular transfer!
 <file2 name="%LOGDIR/heads%TESTNUMBER" crlf="yes">
-220-        _   _ ____  _%spc%%spc%%spc%%spc%%spc%
-220-    ___| | | |  _ \| |%spc%%spc%%spc%%spc%
-220-   / __| | | | |_) | |%spc%%spc%%spc%%spc%
-220-  | (__| |_| |  _ {| |___%spc%
+220-        _   _ ____  _
+220-    ___| | | |  _ \| |
+220-   / __| | | | |_) | |
+220-  | (__| |_| |  _ {| |___
 220    \___|\___/|_| \_\_____|
 331 We are happy you popped in!
 230 Welcome you silly person

diff --git a/tests/data/test1352 b/tests/data/test1352
index 0d48522dd6bc293a422125d948544667597aef7f..cba83dc6640c5ed14e91c77642b6e447faf04d37 100644 (file)
--- a/tests/data/test1352
+++ b/tests/data/test1352
@@ -50,10 +50,10 @@ mooo
 # The final "221 bye bye baby" response to QUIT will not be recorded
 # since that is not considered part of this particular transfer!
 <file2 name="%LOGDIR/stdout%TESTNUMBER" crlf="yes">
-220-        _   _ ____  _%spc%%spc%%spc%%spc%%spc%
-220-    ___| | | |  _ \| |%spc%%spc%%spc%%spc%
-220-   / __| | | | |_) | |%spc%%spc%%spc%%spc%
-220-  | (__| |_| |  _ {| |___%spc%
+220-        _   _ ____  _
+220-    ___| | | |  _ \| |
+220-   / __| | | | |_) | |
+220-  | (__| |_| |  _ {| |___
 220    \___|\___/|_| \_\_____|
 331 We are happy you popped in!
 230 Welcome you silly person

diff --git a/tests/data/test1353 b/tests/data/test1353
index d8ad1c7760d54823397e076a0bbda9ce2b245a04..d454b02501bc6d7b627678493bc3114d827f6d8d 100644 (file)
--- a/tests/data/test1353
+++ b/tests/data/test1353
@@ -49,10 +49,10 @@ mooo
 # The final "221 bye bye baby" response to QUIT will not be recorded
 # since that is not considered part of this particular transfer!
 <file2 name="%LOGDIR/heads%TESTNUMBER" crlf="yes">
-220-        _   _ ____  _%spc%%spc%%spc%%spc%%spc%
-220-    ___| | | |  _ \| |%spc%%spc%%spc%%spc%
-220-   / __| | | | |_) | |%spc%%spc%%spc%%spc%
-220-  | (__| |_| |  _ {| |___%spc%
+220-        _   _ ____  _
+220-    ___| | | |  _ \| |
+220-   / __| | | | |_) | |
+220-  | (__| |_| |  _ {| |___
 220    \___|\___/|_| \_\_____|
 331 We are happy you popped in!
 230 Welcome you silly person

diff --git a/tests/data/test1354 b/tests/data/test1354
index cde07f4605fd6ddfba9ea95cb0ab981e234271fb..94cc34453352a16511abb6c951bdc5b2d2eafbb0 100644 (file)
--- a/tests/data/test1354
+++ b/tests/data/test1354
@@ -47,10 +47,10 @@ mooo
 </file1>
 
 <file2 name="%LOGDIR/stdout%TESTNUMBER" crlf="yes">
-220-        _   _ ____  _%spc%%spc%%spc%%spc%%spc%
-220-    ___| | | |  _ \| |%spc%%spc%%spc%%spc%
-220-   / __| | | | |_) | |%spc%%spc%%spc%%spc%
-220-  | (__| |_| |  _ {| |___%spc%
+220-        _   _ ____  _
+220-    ___| | | |  _ \| |
+220-   / __| | | | |_) | |
+220-  | (__| |_| |  _ {| |___
 220    \___|\___/|_| \_\_____|
 331 We are happy you popped in!
 230 Welcome you silly person

diff --git a/tests/data/test1357 b/tests/data/test1357
index e81c5b46adb9a999a4a9ae4c191527f54dac1668..a83605b88706da9467c8b4f56447da045662efca 100644 (file)
--- a/tests/data/test1357
+++ b/tests/data/test1357
@@ -62,10 +62,10 @@ MOOOO
 </file1>
 
 <file2 name="%LOGDIR/heads%TESTNUMBER" crlf="yes">
-220-        _   _ ____  _%spc%%spc%%spc%%spc%%spc%
-220-    ___| | | |  _ \| |%spc%%spc%%spc%%spc%
-220-   / __| | | | |_) | |%spc%%spc%%spc%%spc%
-220-  | (__| |_| |  _ {| |___%spc%
+220-        _   _ ____  _
+220-    ___| | | |  _ \| |
+220-   / __| | | | |_) | |
+220-  | (__| |_| |  _ {| |___
 220    \___|\___/|_| \_\_____|
 331 We are happy you popped in!
 230 Welcome you silly person

diff --git a/tests/data/test1358 b/tests/data/test1358
index 1bb1053cf913db0afeba7215dcaca096a1da8b24..f5bda613bec311eeb4d17411c8b7aab63b0ee8e4 100644 (file)
--- a/tests/data/test1358
+++ b/tests/data/test1358
@@ -62,10 +62,10 @@ MOOOO
 </file1>
 
 <file2 name="%LOGDIR/stdout%TESTNUMBER" crlf="yes">
-220-        _   _ ____  _%spc%%spc%%spc%%spc%%spc%
-220-    ___| | | |  _ \| |%spc%%spc%%spc%%spc%
-220-   / __| | | | |_) | |%spc%%spc%%spc%%spc%
-220-  | (__| |_| |  _ {| |___%spc%
+220-        _   _ ____  _
+220-    ___| | | |  _ \| |
+220-   / __| | | | |_) | |
+220-  | (__| |_| |  _ {| |___
 220    \___|\___/|_| \_\_____|
 331 We are happy you popped in!
 230 Welcome you silly person

diff --git a/tests/data/test1359 b/tests/data/test1359
index 57472065526735e92aed1fb47fc22bf61d2fd80e..a4c98addd5092353cca5d173b1b87643ee566207 100644 (file)
--- a/tests/data/test1359
+++ b/tests/data/test1359
@@ -63,10 +63,10 @@ MOOOO
 </file1>
 
 <file2 name="%LOGDIR/heads%TESTNUMBER" crlf="yes">
-220-        _   _ ____  _%spc%%spc%%spc%%spc%%spc%
-220-    ___| | | |  _ \| |%spc%%spc%%spc%%spc%
-220-   / __| | | | |_) | |%spc%%spc%%spc%%spc%
-220-  | (__| |_| |  _ {| |___%spc%
+220-        _   _ ____  _
+220-    ___| | | |  _ \| |
+220-   / __| | | | |_) | |
+220-  | (__| |_| |  _ {| |___
 220    \___|\___/|_| \_\_____|
 331 We are happy you popped in!
 230 Welcome you silly person

diff --git a/tests/data/test1360 b/tests/data/test1360
index acd4f8f6c3c4046081ad5cc6a145f0f9f92497c6..d2108ef7a6aa2f16a78d88f3173653b32d2f2f9a 100644 (file)
--- a/tests/data/test1360
+++ b/tests/data/test1360
@@ -63,10 +63,10 @@ MOOOO
 </file1>
 
 <file2 name="%LOGDIR/stdout%TESTNUMBER" crlf="yes">
-220-        _   _ ____  _%spc%%spc%%spc%%spc%%spc%
-220-    ___| | | |  _ \| |%spc%%spc%%spc%%spc%
-220-   / __| | | | |_) | |%spc%%spc%%spc%%spc%
-220-  | (__| |_| |  _ {| |___%spc%
+220-        _   _ ____  _
+220-    ___| | | |  _ \| |
+220-   / __| | | | |_) | |
+220-  | (__| |_| |  _ {| |___
 220    \___|\___/|_| \_\_____|
 331 We are happy you popped in!
 230 Welcome you silly person

diff --git a/tests/data/test1361 b/tests/data/test1361
index 390366817c2a17aa4a474a97d60852dd0344d30e..242162c8eee8ef95ae7d40bc5df8f5b324d94623 100644 (file)
--- a/tests/data/test1361
+++ b/tests/data/test1361
@@ -62,10 +62,10 @@ MOOOO
 </file1>
 
 <file2 name="%LOGDIR/heads%TESTNUMBER" crlf="yes">
-220-        _   _ ____  _%spc%%spc%%spc%%spc%%spc%
-220-    ___| | | |  _ \| |%spc%%spc%%spc%%spc%
-220-   / __| | | | |_) | |%spc%%spc%%spc%%spc%
-220-  | (__| |_| |  _ {| |___%spc%
+220-        _   _ ____  _
+220-    ___| | | |  _ \| |
+220-   / __| | | | |_) | |
+220-  | (__| |_| |  _ {| |___
 220    \___|\___/|_| \_\_____|
 331 We are happy you popped in!
 230 Welcome you silly person

diff --git a/tests/data/test1362 b/tests/data/test1362
index f4ea6917565e20630a05b70987f73d8ad1cc5890..6695b740e570c5134aa38094c10f0637b3f69d36 100644 (file)
--- a/tests/data/test1362
+++ b/tests/data/test1362
@@ -62,10 +62,10 @@ MOOOO
 </file1>
 
 <file2 name="%LOGDIR/stdout%TESTNUMBER" crlf="yes">
-220-        _   _ ____  _%spc%%spc%%spc%%spc%%spc%
-220-    ___| | | |  _ \| |%spc%%spc%%spc%%spc%
-220-   / __| | | | |_) | |%spc%%spc%%spc%%spc%
-220-  | (__| |_| |  _ {| |___%spc%
+220-        _   _ ____  _
+220-    ___| | | |  _ \| |
+220-   / __| | | | |_) | |
+220-  | (__| |_| |  _ {| |___
 220    \___|\___/|_| \_\_____|
 331 We are happy you popped in!
 230 Welcome you silly person

diff --git a/tests/data/test1379 b/tests/data/test1379
index f938ba659ebce5bdf18a8e54ec8502fdbac7b010..6630161e568ca07858863ac0e9f0ddc655bf1aac 100644 (file)
--- a/tests/data/test1379
+++ b/tests/data/test1379
@@ -47,10 +47,10 @@ mooo
 </file1>
 
 <file2 name="%LOGDIR/heads%TESTNUMBER" crlf="yes">
-220-        _   _ ____  _%spc%%spc%%spc%%spc%%spc%
-220-    ___| | | |  _ \| |%spc%%spc%%spc%%spc%
-220-   / __| | | | |_) | |%spc%%spc%%spc%%spc%
-220-  | (__| |_| |  _ {| |___%spc%
+220-        _   _ ____  _
+220-    ___| | | |  _ \| |
+220-   / __| | | | |_) | |
+220-  | (__| |_| |  _ {| |___
 220    \___|\___/|_| \_\_____|
 331 We are happy you popped in!
 230 Welcome you silly person

diff --git a/tests/data/test1380 b/tests/data/test1380
index d6dc739d82af7b51a15a529ef4c0da2775da6b4d..b4f5dccd877cbcbe78076e36b4ee074e8893b337 100644 (file)
--- a/tests/data/test1380
+++ b/tests/data/test1380
@@ -47,10 +47,10 @@ mooo
 </file1>
 
 <file2 name="%LOGDIR/stdout%TESTNUMBER" crlf="yes">
-220-        _   _ ____  _%spc%%spc%%spc%%spc%%spc%
-220-    ___| | | |  _ \| |%spc%%spc%%spc%%spc%
-220-   / __| | | | |_) | |%spc%%spc%%spc%%spc%
-220-  | (__| |_| |  _ {| |___%spc%
+220-        _   _ ____  _
+220-    ___| | | |  _ \| |
+220-   / __| | | | |_) | |
+220-  | (__| |_| |  _ {| |___
 220    \___|\___/|_| \_\_____|
 331 We are happy you popped in!
 230 Welcome you silly person

diff --git a/tests/data/test1381 b/tests/data/test1381
index 520d0a066b2ae65cec65b920f0a62aee11483179..cf635ffe464fc2b192889d0abb7af5e1dc53998b 100644 (file)
--- a/tests/data/test1381
+++ b/tests/data/test1381
@@ -48,10 +48,10 @@ mooo
 </file1>
 
 <file2 name="%LOGDIR/heads%TESTNUMBER" crlf="yes">
-220-        _   _ ____  _%spc%%spc%%spc%%spc%%spc%
-220-    ___| | | |  _ \| |%spc%%spc%%spc%%spc%
-220-   / __| | | | |_) | |%spc%%spc%%spc%%spc%
-220-  | (__| |_| |  _ {| |___%spc%
+220-        _   _ ____  _
+220-    ___| | | |  _ \| |
+220-   / __| | | | |_) | |
+220-  | (__| |_| |  _ {| |___
 220    \___|\___/|_| \_\_____|
 331 We are happy you popped in!
 230 Welcome you silly person

diff --git a/tests/data/test1382 b/tests/data/test1382
index c9f53dd06579ad0982ee8adb39cf1cb125a4a715..8c270ad7ae4edc9fe1f6c4b4ea5f11a037301157 100644 (file)
--- a/tests/data/test1382
+++ b/tests/data/test1382
@@ -48,10 +48,10 @@ mooo
 </file1>
 
 <file2 name="%LOGDIR/stdout%TESTNUMBER" crlf="yes">
-220-        _   _ ____  _%spc%%spc%%spc%%spc%%spc%
-220-    ___| | | |  _ \| |%spc%%spc%%spc%%spc%
-220-   / __| | | | |_) | |%spc%%spc%%spc%%spc%
-220-  | (__| |_| |  _ {| |___%spc%
+220-        _   _ ____  _
+220-    ___| | | |  _ \| |
+220-   / __| | | | |_) | |
+220-  | (__| |_| |  _ {| |___
 220    \___|\___/|_| \_\_____|
 331 We are happy you popped in!
 230 Welcome you silly person

diff --git a/tests/data/test1383 b/tests/data/test1383
index 24e339d9789f1302c6968bffdb444d442acad961..319b6ca7d207d5955875ccbabcbbbaadd740eea7 100644 (file)
--- a/tests/data/test1383
+++ b/tests/data/test1383
@@ -47,10 +47,10 @@ mooo
 </file1>
 
 <file2 name="%LOGDIR/heads%TESTNUMBER" crlf="yes">
-220-        _   _ ____  _%spc%%spc%%spc%%spc%%spc%
-220-    ___| | | |  _ \| |%spc%%spc%%spc%%spc%
-220-   / __| | | | |_) | |%spc%%spc%%spc%%spc%
-220-  | (__| |_| |  _ {| |___%spc%
+220-        _   _ ____  _
+220-    ___| | | |  _ \| |
+220-   / __| | | | |_) | |
+220-  | (__| |_| |  _ {| |___
 220    \___|\___/|_| \_\_____|
 331 We are happy you popped in!
 230 Welcome you silly person

diff --git a/tests/data/test1384 b/tests/data/test1384
index 490d9a5e8be7bf699c96343e9b0708051b64965b..a36a11eee72c56d8c28e1167fc0265a40ec1879d 100644 (file)
--- a/tests/data/test1384
+++ b/tests/data/test1384
@@ -47,10 +47,10 @@ mooo
 </file1>
 
 <file2 name="%LOGDIR/stdout%TESTNUMBER" crlf="yes">
-220-        _   _ ____  _%spc%%spc%%spc%%spc%%spc%
-220-    ___| | | |  _ \| |%spc%%spc%%spc%%spc%
-220-   / __| | | | |_) | |%spc%%spc%%spc%%spc%
-220-  | (__| |_| |  _ {| |___%spc%
+220-        _   _ ____  _
+220-    ___| | | |  _ \| |
+220-   / __| | | | |_) | |
+220-  | (__| |_| |  _ {| |___
 220    \___|\___/|_| \_\_____|
 331 We are happy you popped in!
 230 Welcome you silly person

diff --git a/tests/data/test1387 b/tests/data/test1387
index 4002c28e01adb47982190385ea3fb4955f01c7af..dc28f4ccd54a58493fcd82b05d2ab61bb7d04114 100644 (file)
--- a/tests/data/test1387
+++ b/tests/data/test1387
@@ -62,10 +62,10 @@ MOOOO
 </file1>
 
 <file2 name="%LOGDIR/heads%TESTNUMBER" crlf="yes">
-220-        _   _ ____  _%spc%%spc%%spc%%spc%%spc%
-220-    ___| | | |  _ \| |%spc%%spc%%spc%%spc%
-220-   / __| | | | |_) | |%spc%%spc%%spc%%spc%
-220-  | (__| |_| |  _ {| |___%spc%
+220-        _   _ ____  _
+220-    ___| | | |  _ \| |
+220-   / __| | | | |_) | |
+220-  | (__| |_| |  _ {| |___
 220    \___|\___/|_| \_\_____|
 331 We are happy you popped in!
 230 Welcome you silly person

diff --git a/tests/data/test1388 b/tests/data/test1388
index 21491ab40f595ec7e21c0c06d4310b9aa13107d5..3706fe14340a7d989bf57251eec1bad262899a03 100644 (file)
--- a/tests/data/test1388
+++ b/tests/data/test1388
@@ -62,10 +62,10 @@ MOOOO
 </file1>
 
 <file2 name="%LOGDIR/stdout%TESTNUMBER" crlf="yes">
-220-        _   _ ____  _%spc%%spc%%spc%%spc%%spc%
-220-    ___| | | |  _ \| |%spc%%spc%%spc%%spc%
-220-   / __| | | | |_) | |%spc%%spc%%spc%%spc%
-220-  | (__| |_| |  _ {| |___%spc%
+220-        _   _ ____  _
+220-    ___| | | |  _ \| |
+220-   / __| | | | |_) | |
+220-  | (__| |_| |  _ {| |___
 220    \___|\___/|_| \_\_____|
 331 We are happy you popped in!
 230 Welcome you silly person

diff --git a/tests/data/test1389 b/tests/data/test1389
index 2f247d45dc82354c235780e0627c656533daca54..e9566cca844ee1b717d549ad40e96399e5a5dbb7 100644 (file)
--- a/tests/data/test1389
+++ b/tests/data/test1389
@@ -63,10 +63,10 @@ MOOOO
 </file1>
 
 <file2 name="%LOGDIR/heads%TESTNUMBER" crlf="yes">
-220-        _   _ ____  _%spc%%spc%%spc%%spc%%spc%
-220-    ___| | | |  _ \| |%spc%%spc%%spc%%spc%
-220-   / __| | | | |_) | |%spc%%spc%%spc%%spc%
-220-  | (__| |_| |  _ {| |___%spc%
+220-        _   _ ____  _
+220-    ___| | | |  _ \| |
+220-   / __| | | | |_) | |
+220-  | (__| |_| |  _ {| |___
 220    \___|\___/|_| \_\_____|
 331 We are happy you popped in!
 230 Welcome you silly person

diff --git a/tests/data/test1390 b/tests/data/test1390
index 9c180b65a61b89f57cf3a904cdcdcd966bec0f2d..0a3cdce5683c2e14e3abad9d61c5036100ed27a5 100644 (file)
--- a/tests/data/test1390
+++ b/tests/data/test1390
@@ -63,10 +63,10 @@ MOOOO
 </file1>
 
 <file2 name="%LOGDIR/stdout%TESTNUMBER" crlf="yes">
-220-        _   _ ____  _%spc%%spc%%spc%%spc%%spc%
-220-    ___| | | |  _ \| |%spc%%spc%%spc%%spc%
-220-   / __| | | | |_) | |%spc%%spc%%spc%%spc%
-220-  | (__| |_| |  _ {| |___%spc%
+220-        _   _ ____  _
+220-    ___| | | |  _ \| |
+220-   / __| | | | |_) | |
+220-  | (__| |_| |  _ {| |___
 220    \___|\___/|_| \_\_____|
 331 We are happy you popped in!
 230 Welcome you silly person

diff --git a/tests/data/test1391 b/tests/data/test1391
index f29e02859279d9eb4bf8a258e285bfcd09c8bde6..daa22eabc6ed4dd81d3250f75903f40916598852 100644 (file)
--- a/tests/data/test1391
+++ b/tests/data/test1391
@@ -62,10 +62,10 @@ MOOOO
 </file1>
 
 <file2 name="%LOGDIR/heads%TESTNUMBER" crlf="yes">
-220-        _   _ ____  _%spc%%spc%%spc%%spc%%spc%
-220-    ___| | | |  _ \| |%spc%%spc%%spc%%spc%
-220-   / __| | | | |_) | |%spc%%spc%%spc%%spc%
-220-  | (__| |_| |  _ {| |___%spc%
+220-        _   _ ____  _
+220-    ___| | | |  _ \| |
+220-   / __| | | | |_) | |
+220-  | (__| |_| |  _ {| |___
 220    \___|\___/|_| \_\_____|
 331 We are happy you popped in!
 230 Welcome you silly person

diff --git a/tests/data/test1392 b/tests/data/test1392
index 598facd1561a8db459e44dbe6330f5f2c998cf9f..6678c67000bd6e49bc35311ea0f8dbf9da372ea5 100644 (file)
--- a/tests/data/test1392
+++ b/tests/data/test1392
@@ -62,10 +62,10 @@ MOOOO
 </file1>
 
 <file2 name="%LOGDIR/stdout%TESTNUMBER" crlf="yes">
-220-        _   _ ____  _%spc%%spc%%spc%%spc%%spc%
-220-    ___| | | |  _ \| |%spc%%spc%%spc%%spc%
-220-   / __| | | | |_) | |%spc%%spc%%spc%%spc%
-220-  | (__| |_| |  _ {| |___%spc%
+220-        _   _ ____  _
+220-    ___| | | |  _ \| |
+220-   / __| | | | |_) | |
+220-  | (__| |_| |  _ {| |___
 220    \___|\___/|_| \_\_____|
 331 We are happy you popped in!
 230 Welcome you silly person

diff --git a/tests/data/test897 b/tests/data/test897
index e7119cf34dc18b9d48d24e053ecca8ba8df5bfc9..acf1cd5fe4d7154c6eca968747084e1d1e0b206f 100644 (file)
--- a/tests/data/test897
+++ b/tests/data/test897
@@ -46,10 +46,10 @@ A004 FETCH 123 BODY[1]
 A005 LOGOUT
 </protocol>
 <file name="%LOGDIR/head-%TESTNUMBER" crlf="yes">
-        _   _ ____  _%spc%%spc%%spc%%spc%%spc%
-    ___| | | |  _ \| |%spc%%spc%%spc%%spc%
-   / __| | | | |_) | |%spc%%spc%%spc%%spc%
-  | (__| |_| |  _ {| |___%spc%
+        _   _ ____  _
+    ___| | | |  _ \| |
+   / __| | | | |_) | |
+  | (__| |_| |  _ {| |___
    \___|\___/|_| \_\_____|
 * OK curl IMAP server ready to serve
 A001 BAD Command

diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl
index f70fa0d0ee7e639f49a1d94082d66c368a487715..cd725fccfdb9a6535acbb00510ace98853cac251 100755 (executable)
--- a/tests/ftpserver.pl
+++ b/tests/ftpserver.pl
@@ -573,10 +573,10 @@ sub protocolsetup {
             'PBSZ' => '500 PBSZ not implemented',
             'PROT' => '500 PROT not implemented',
             'welcome' => join("",
-            '220-        _   _ ____  _     '."\r\n",
-            '220-    ___| | | |  _ \| |    '."\r\n",
-            '220-   / __| | | | |_) | |    '."\r\n",
-            '220-  | (__| |_| |  _ {| |___ '."\r\n",
+            '220-        _   _ ____  _'."\r\n",
+            '220-    ___| | | |  _ \| |'."\r\n",
+            '220-   / __| | | | |_) | |'."\r\n",
+            '220-  | (__| |_| |  _ {| |___'."\r\n",
             '220    \___|\___/|_| \_\_____|'."\r\n")
         );
     }
@@ -599,10 +599,10 @@ sub protocolsetup {
         );
         %displaytext = (
             'welcome' => join("",
-            '        _   _ ____  _     '."\r\n",
-            '    ___| | | |  _ \| |    '."\r\n",
-            '   / __| | | | |_) | |    '."\r\n",
-            '  | (__| |_| |  _ {| |___ '."\r\n",
+            '        _   _ ____  _'."\r\n",
+            '    ___| | | |  _ \| |'."\r\n",
+            '   / __| | | | |_) | |'."\r\n",
+            '  | (__| |_| |  _ {| |___'."\r\n",
             '   \___|\___/|_| \_\_____|'."\r\n",
             '+OK curl POP3 server ready to serve '."\r\n")
         );
@@ -634,10 +634,10 @@ sub protocolsetup {
         );
         %displaytext = (
             'welcome' => join("",
-            '        _   _ ____  _     '."\r\n",
-            '    ___| | | |  _ \| |    '."\r\n",
-            '   / __| | | | |_) | |    '."\r\n",
-            '  | (__| |_| |  _ {| |___ '."\r\n",
+            '        _   _ ____  _'."\r\n",
+            '    ___| | | |  _ \| |'."\r\n",
+            '   / __| | | | |_) | |'."\r\n",
+            '  | (__| |_| |  _ {| |___'."\r\n",
             '   \___|\___/|_| \_\_____|'."\r\n",
             '* OK curl IMAP server ready to serve'."\r\n")
         );
@@ -658,10 +658,10 @@ sub protocolsetup {
         );
         %displaytext = (
             'welcome' => join("",
-            '220-        _   _ ____  _     '."\r\n",
-            '220-    ___| | | |  _ \| |    '."\r\n",
-            '220-   / __| | | | |_) | |    '."\r\n",
-            '220-  | (__| |_| |  _ {| |___ '."\r\n",
+            '220-        _   _ ____  _'."\r\n",
+            '220-    ___| | | |  _ \| |'."\r\n",
+            '220-   / __| | | | |_) | |'."\r\n",
+            '220-  | (__| |_| |  _ {| |___'."\r\n",
             '220    \___|\___/|_| \_\_____|'."\r\n")
         );
     }