From: Daniel Stenberg Date: Wed, 5 Nov 2025 13:30:41 +0000 (+0100) Subject: tests: remove trailing spaces in server responses X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c12a1fdd0e8151e2d36fb695ea96959c2aa85f07;p=thirdparty%2Fcurl.git 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 da34bcf87c..faf1260c28 100644 --- 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! -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 a795a0bd32..9fd7f89785 100644 --- 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! -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 99625533ec..139537e378 100644 --- 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! -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 0d48522dd6..cba83dc664 100644 --- 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! -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 d8ad1c7760..d454b02501 100644 --- 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! -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 cde07f4605..94cc344533 100644 --- a/tests/data/test1354 +++ b/tests/data/test1354 @@ -47,10 +47,10 @@ mooo -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 e81c5b46ad..a83605b887 100644 --- a/tests/data/test1357 +++ b/tests/data/test1357 @@ -62,10 +62,10 @@ MOOOO -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 1bb1053cf9..f5bda613be 100644 --- a/tests/data/test1358 +++ b/tests/data/test1358 @@ -62,10 +62,10 @@ MOOOO -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 5747206552..a4c98addd5 100644 --- a/tests/data/test1359 +++ b/tests/data/test1359 @@ -63,10 +63,10 @@ MOOOO -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 acd4f8f6c3..d2108ef7a6 100644 --- a/tests/data/test1360 +++ b/tests/data/test1360 @@ -63,10 +63,10 @@ MOOOO -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 390366817c..242162c8ee 100644 --- a/tests/data/test1361 +++ b/tests/data/test1361 @@ -62,10 +62,10 @@ MOOOO -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 f4ea691756..6695b740e5 100644 --- a/tests/data/test1362 +++ b/tests/data/test1362 @@ -62,10 +62,10 @@ MOOOO -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 f938ba659e..6630161e56 100644 --- a/tests/data/test1379 +++ b/tests/data/test1379 @@ -47,10 +47,10 @@ mooo -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 d6dc739d82..b4f5dccd87 100644 --- a/tests/data/test1380 +++ b/tests/data/test1380 @@ -47,10 +47,10 @@ mooo -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 520d0a066b..cf635ffe46 100644 --- a/tests/data/test1381 +++ b/tests/data/test1381 @@ -48,10 +48,10 @@ mooo -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 c9f53dd065..8c270ad7ae 100644 --- a/tests/data/test1382 +++ b/tests/data/test1382 @@ -48,10 +48,10 @@ mooo -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 24e339d978..319b6ca7d2 100644 --- a/tests/data/test1383 +++ b/tests/data/test1383 @@ -47,10 +47,10 @@ mooo -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 490d9a5e8b..a36a11eee7 100644 --- a/tests/data/test1384 +++ b/tests/data/test1384 @@ -47,10 +47,10 @@ mooo -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 4002c28e01..dc28f4ccd5 100644 --- a/tests/data/test1387 +++ b/tests/data/test1387 @@ -62,10 +62,10 @@ MOOOO -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 21491ab40f..3706fe1434 100644 --- a/tests/data/test1388 +++ b/tests/data/test1388 @@ -62,10 +62,10 @@ MOOOO -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 2f247d45dc..e9566cca84 100644 --- a/tests/data/test1389 +++ b/tests/data/test1389 @@ -63,10 +63,10 @@ MOOOO -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 9c180b65a6..0a3cdce568 100644 --- a/tests/data/test1390 +++ b/tests/data/test1390 @@ -63,10 +63,10 @@ MOOOO -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 f29e028592..daa22eabc6 100644 --- a/tests/data/test1391 +++ b/tests/data/test1391 @@ -62,10 +62,10 @@ MOOOO -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 598facd156..6678c67000 100644 --- a/tests/data/test1392 +++ b/tests/data/test1392 @@ -62,10 +62,10 @@ MOOOO -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 e7119cf34d..acf1cd5fe4 100644 --- a/tests/data/test897 +++ b/tests/data/test897 @@ -46,10 +46,10 @@ A004 FETCH 123 BODY[1] A005 LOGOUT - _ _ ____ _%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 f70fa0d0ee..cd725fccfd 100755 --- 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") ); }