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
2026-04-24 20:22:13 +03:00 · 2025-11-05 14:30:41 +01:00 · 2025-11-05 14:30:41 +01:00 · c12a1fdd0e
commit c12a1fdd0e
parent a8bef39036
26 changed files with 116 additions and 116 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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")
        );
    }