Testsuite: account for changed feature name

Broken-by: a375c22c1d

diff --git a/test/scripts/4050-pipe-conn/4050 b/test/scripts/4050-pipe-conn/4050
index 9b06defbb2d7cf58ee54cb25df37922c311f32d6..a969b3f8555e0777d9d20ebaafdd45fc01c9b901 100644 (file)
--- a/test/scripts/4050-pipe-conn/4050
+++ b/test/scripts/4050-pipe-conn/4050
@@ -28,7 +28,7 @@ EHLO testclient
 ??? 250-SIZE
 ??? 250-8BITMIME
 ??? 250-PIPELINING
-??? 250-PIPE_CONNECT
+??? 250-PIPECONNECT
 ??? 250 HELP
 QUIT
 ??? 221
@@ -46,7 +46,7 @@ EHLO testclient
 ??? 250-SIZE
 ??? 250-8BITMIME
 ??? 250-PIPELINING
-??? 250-PIPE_CONNECT
+??? 250-PIPECONNECT
 ??? 250 HELP
 QUIT
 ??? 221
@@ -59,7 +59,7 @@ EHLO testclient\r\nMAIL FROM:<a@test.ex>
 ??? 250-SIZE
 ??? 250-8BITMIME
 ??? 250-PIPELINING
-??? 250-PIPE_CONNECT
+??? 250-PIPECONNECT
 ??? 250 HELP
 ??? 250
 QUIT
@@ -73,7 +73,7 @@ EHLO testclient\r\nMAIL FROM:<a@test.ex>\r\nRCPT TO:<a@test.ex>
 ??? 250-SIZE
 ??? 250-8BITMIME
 ??? 250-PIPELINING
-??? 250-PIPE_CONNECT
+??? 250-PIPECONNECT
 ??? 250 HELP
 ??? 250
 ??? 250
@@ -88,7 +88,7 @@ EHLO testclient\r\nMAIL FROM:<a@test.ex>\r\nRCPT TO:<a@test.ex>\r\nDATA
 ??? 250-SIZE
 ??? 250-8BITMIME
 ??? 250-PIPELINING
-??? 250-PIPE_CONNECT
+??? 250-PIPECONNECT
 ??? 250 HELP
 ??? 250
 ??? 250

diff --git a/test/scripts/4050-pipe-conn/4052 b/test/scripts/4050-pipe-conn/4052
index 8ee4947444f71adac7f5b42db119036365e97100..ba550fd6cda7878b591d4e060f962856aec8ab89 100644 (file)
--- a/test/scripts/4050-pipe-conn/4052
+++ b/test/scripts/4050-pipe-conn/4052
@@ -53,7 +53,7 @@ server PORT_D
 <EHLO
 >250-esmtp-resp
 >250-PIPELINING
->250-PIPE_CONNECT
+>250-PIPECONNECT
 >250 ok
 <MAIL
 >250 mail-from accepted
@@ -75,7 +75,7 @@ server PORT_D
 <EHLO
 >250-esmtp-resp
 >250-PIPELINING
->250-PIPE_CONNECT
+>250-PIPECONNECT
 >250 ok
 <MAIL
 >250 mail-from accepted
@@ -118,7 +118,7 @@ server PORT_D
 <EHLO
 >250-esmtp-resp
 >250-PIPELINING
->250-PIPE_CONNECT
+>250-PIPECONNECT
 >250 ok
 <MAIL
 >250 mail-from accepted
@@ -140,7 +140,7 @@ server PORT_D
 <EHLO
 >250-esmtp-resp
 >250-PIPELINING
->250-PIPE_CONNECT
+>250-PIPECONNECT
 >250 ok
 <MAIL
 >250 mail-from accepted
@@ -166,7 +166,7 @@ server PORT_D
 >220 banner
 >250-esmtp-resp
 >250-PIPELINING
->250-PIPE_CONNECT
+>250-PIPECONNECT
 >250 ok
 >250 mail good
 >250 rcpt good
@@ -187,7 +187,7 @@ server PORT_D
 >220 banner
 >250-esmtp-resp
 >250-PIPELINING
->250-PIPE_CONNECT
+>250-PIPECONNECT
 >250 ok
 >250 mail good
 >550 rcpt refused
@@ -208,7 +208,7 @@ server PORT_D
 >220 banner
 >250-esmtp-resp
 >250-PIPELINING
->250-PIPE_CONNECT
+>250-PIPECONNECT
 >250 ok
 >550 mail cmd refused
 >550 rcpt cmd rejected - no valid mail
@@ -226,7 +226,7 @@ server PORT_D
 <EHLO
 >250-esmtp-resp
 >250-PIPELINING
->250-PIPE_CONNECT
+>250-PIPECONNECT
 >250 ok
 <MAIL
 >250 mail-from accepted
@@ -258,7 +258,7 @@ server PORT_D 1
 <EHLO
 >250-esmtp-resp
 >250-PIPELINING
->250-PIPE_CONNECT
+>250-PIPECONNECT
 >250-SIZE
 >250 ok
 <MAIL

diff --git a/test/scripts/4050-pipe-conn/REQUIRES b/test/scripts/4050-pipe-conn/REQUIRES
index 1b9b3f83c542078c1f7623c462dde0a026e62aa4..52f2130d580f522d33b84d90fa16c25e6efa8aa3 100644 (file)
--- a/test/scripts/4050-pipe-conn/REQUIRES
+++ b/test/scripts/4050-pipe-conn/REQUIRES
@@ -1 +1 @@
-support PIPE_CONNECT
+support PIPECONNECT

diff --git a/test/scripts/4056-pipe-conn-auth/REQUIRES b/test/scripts/4056-pipe-conn-auth/REQUIRES
index 5d02ef731bc2d570d3c3a1e564b0d735964e3b9b..77e7498925bb7a42be24f512122967cd35f3cbfb 100644 (file)
--- a/test/scripts/4056-pipe-conn-auth/REQUIRES
+++ b/test/scripts/4056-pipe-conn-auth/REQUIRES
@@ -1,2 +1,2 @@
-support PIPE_CONNECT
+support PIPECONNECT
 authenticator plaintext

diff --git a/test/scripts/4058-pipe-conn-tfo/REQUIRES b/test/scripts/4058-pipe-conn-tfo/REQUIRES
index 5136f5257c7c4aeb814f9605a1926f67da58a5ff..01b20f12707492ed9c158904512139163d364929 100644 (file)
--- a/test/scripts/4058-pipe-conn-tfo/REQUIRES
+++ b/test/scripts/4058-pipe-conn-tfo/REQUIRES
@@ -1,2 +1,2 @@
-support PIPE_CONNECT
+support PIPECONNECT
 support TCP_Fast_Open

diff --git a/test/scripts/4060-pipe-conn-gnutls/REQUIRES b/test/scripts/4060-pipe-conn-gnutls/REQUIRES
index 9c2dba1fb57d41ded4b7204b43555aa78a0b6378..d31cf00dbf29688c060f562804a30ea9a1003ee2 100644 (file)
--- a/test/scripts/4060-pipe-conn-gnutls/REQUIRES
+++ b/test/scripts/4060-pipe-conn-gnutls/REQUIRES
@@ -1,2 +1,2 @@
-support PIPE_CONNECT
+support PIPECONNECT
 support GnuTLS

diff --git a/test/scripts/4062-pipe-conn-openssl/REQUIRES b/test/scripts/4062-pipe-conn-openssl/REQUIRES
index 14cbb1305154a7da35dd19fbd54b08b4ffe30825..48c1d7d461a61d95ea773162ec0fbe9ee87f1e59 100644 (file)
--- a/test/scripts/4062-pipe-conn-openssl/REQUIRES
+++ b/test/scripts/4062-pipe-conn-openssl/REQUIRES
@@ -1,2 +1,2 @@
-support PIPE_CONNECT
+support PIPECONNECT
 support OpenSSL

diff --git a/test/scripts/4064-pipe-conn-gnutls-auth/REQUIRES b/test/scripts/4064-pipe-conn-gnutls-auth/REQUIRES
index a7b932236d5739b3f9cef03fdf6a96559e5495b2..5bfda90baab23812e26a2768f386a1e90913b1da 100644 (file)
--- a/test/scripts/4064-pipe-conn-gnutls-auth/REQUIRES
+++ b/test/scripts/4064-pipe-conn-gnutls-auth/REQUIRES
@@ -1,3 +1,3 @@
-support PIPE_CONNECT
+support PIPECONNECT
 support GnuTLS
 authenticator plaintext

diff --git a/test/scripts/4066-pipe-conn-openssl-auth/REQUIRES b/test/scripts/4066-pipe-conn-openssl-auth/REQUIRES
index 502171d901cd498681405571b9d130eea5c9dcdf..6c09cd0f4d228469bce563f4377d2680852033f2 100644 (file)
--- a/test/scripts/4066-pipe-conn-openssl-auth/REQUIRES
+++ b/test/scripts/4066-pipe-conn-openssl-auth/REQUIRES
@@ -1,3 +1,3 @@
-support PIPE_CONNECT
+support PIPECONNECT
 support OpenSSL
 authenticator plaintext

diff --git a/test/scripts/4068-pipe-conn-gnutls-tfo/REQUIRES b/test/scripts/4068-pipe-conn-gnutls-tfo/REQUIRES
index 7531f8c261a8df511355aa4cbcf73950cc5844ae..46695103314dd699148cd21436a8a1a2eb218cca 100644 (file)
--- a/test/scripts/4068-pipe-conn-gnutls-tfo/REQUIRES
+++ b/test/scripts/4068-pipe-conn-gnutls-tfo/REQUIRES
@@ -1,3 +1,3 @@
-support PIPE_CONNECT
+support PIPECONNECT
 support GnuTLS
 support TCP_Fast_Open

diff --git a/test/scripts/4069-pipe-conn-openssl-tfo/REQUIRES b/test/scripts/4069-pipe-conn-openssl-tfo/REQUIRES
index b8d0734b31bf9df198bf2a41f72bd7511939aff0..eb7686bbccda3187b5cc8835f66b50ec506903a6 100644 (file)
--- a/test/scripts/4069-pipe-conn-openssl-tfo/REQUIRES
+++ b/test/scripts/4069-pipe-conn-openssl-tfo/REQUIRES
@@ -1,3 +1,3 @@
-support PIPE_CONNECT
+support PIPECONNECT
 support OpenSSL
 support TCP_Fast_Open

diff --git a/test/stderr/4052 b/test/stderr/4052
index 4c0c1b1ca99b12fa1b52e69778c1c73784f7e4e6..72841ee1fac529c42905b79eeeb4a79b59d9a57a 100644 (file)
--- a/test/stderr/4052
+++ b/test/stderr/4052
@@ -21,7 +21,7 @@ no message retry record
 delivering 10HmbP-0005vi-00 to 127.0.0.1 [127.0.0.1] (extchange@test.ex)
 Transport port=25 replaced by host-specific port=1225
 EHLO response bits from cache: cleartext 0x0120/0x0000 crypted 0x0000/0x0000
-Using cached cleartext PIPE_CONNECT
+Using cached cleartext PIPECONNECT
   SMTP|> EHLO the.local.host.name
 using PIPELINING
 not using DSN
@@ -36,7 +36,7 @@ smtp_reap_early_pipe expect banner
 smtp_reap_early_pipe expect ehlo
   SMTP<< 250-esmtp-resp
          250-PIPELINING
-         250-PIPE_CONNECT
+         250-PIPECONNECT
          250-SIZE
          250 ok
 EHLO cleartext extensions changed, 0x0120/0x0000 -> 0x0160/0x0000
@@ -54,6 +54,7 @@ transport_check_waiting entered
 transport_check_waiting: FALSE
 will pipeline QUIT
 cannot use sendfile for body: spoolfile not wireformat
+  SMTP>> .
 writing data block fd=dddd size=sss timeout=300 (more expected)
   SMTP+> QUIT
 cmd buf flush ddd bytes (more expected)
@@ -62,6 +63,7 @@ cmd buf flush ddd bytes (more expected)
 ok=1 send_quit=0 send_rset=0 continue_more=0 yield=0 first_address is NULL
   SMTP<< 220 bye
   SMTP(close)>>
+cmdlog: 'EHLO|:MAIL|:RCPT|:DATA:220:250-:250:250:354:.:QUIT:250:220'
 Leaving smtp transport
 LOG: MAIN
   => extchange@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] L* C="250 message accepted"

diff --git a/test/stdout/4050 b/test/stdout/4050
index 9e78c5f74dd3516b97951efa0f51bcd1edffa3ed..00dd50200fc77be26fefdd44661e9b14d9c9d8ee 100644 (file)
--- a/test/stdout/4050
+++ b/test/stdout/4050
@@ -28,8 +28,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 250-8BITMIME
 ??? 250-PIPELINING
 <<< 250-PIPELINING
-??? 250-PIPE_CONNECT
-<<< 250-PIPE_CONNECT
+??? 250-PIPECONNECT
+<<< 250-PIPECONNECT
 ??? 250 HELP
 <<< 250 HELP
 >>> QUIT
@@ -48,8 +48,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 250-8BITMIME
 ??? 250-PIPELINING
 <<< 250-PIPELINING
-??? 250-PIPE_CONNECT
-<<< 250-PIPE_CONNECT
+??? 250-PIPECONNECT
+<<< 250-PIPECONNECT
 ??? 250 HELP
 <<< 250 HELP
 >>> QUIT
@@ -68,8 +68,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 250-8BITMIME
 ??? 250-PIPELINING
 <<< 250-PIPELINING
-??? 250-PIPE_CONNECT
-<<< 250-PIPE_CONNECT
+??? 250-PIPECONNECT
+<<< 250-PIPECONNECT
 ??? 250 HELP
 <<< 250 HELP
 ??? 250
@@ -90,8 +90,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 250-8BITMIME
 ??? 250-PIPELINING
 <<< 250-PIPELINING
-??? 250-PIPE_CONNECT
-<<< 250-PIPE_CONNECT
+??? 250-PIPECONNECT
+<<< 250-PIPECONNECT
 ??? 250 HELP
 <<< 250 HELP
 ??? 250
@@ -114,8 +114,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 250-8BITMIME
 ??? 250-PIPELINING
 <<< 250-PIPELINING
-??? 250-PIPE_CONNECT
-<<< 250-PIPE_CONNECT
+??? 250-PIPECONNECT
+<<< 250-PIPECONNECT
 ??? 250 HELP
 <<< 250 HELP
 ??? 250

diff --git a/test/stdout/4052 b/test/stdout/4052
index c84be25a525b9555ea9d5d4ea92b85c60d880dde..63a12c926db4874cbb6909c382c721d6e7cb9412 100644 (file)
--- a/test/stdout/4052
+++ b/test/stdout/4052
@@ -8,7 +8,7 @@ Connection request from [127.0.0.1]
 <EHLO the.local.host.name
 >250-esmtp-resp
 >250-PIPELINING
->250-PIPE_CONNECT
+>250-PIPECONNECT
 >250 ok
 <MAIL FROM:<CALLER@the.local.host.name>
 >250 mail-from accepted
@@ -38,7 +38,7 @@ Connection request from [127.0.0.1]
 <EHLO the.local.host.name
 >250-esmtp-resp
 >250-PIPELINING
->250-PIPE_CONNECT
+>250-PIPECONNECT
 >250 ok
 <MAIL FROM:<CALLER@the.local.host.name>
 >250 mail-from accepted
@@ -84,7 +84,7 @@ Connection request from [127.0.0.1]
 <EHLO the.local.host.name
 >250-esmtp-resp
 >250-PIPELINING
->250-PIPE_CONNECT
+>250-PIPECONNECT
 >250 ok
 <MAIL FROM:<CALLER@the.local.host.name>
 >250 mail-from accepted
@@ -114,7 +114,7 @@ Connection request from [127.0.0.1]
 <EHLO the.local.host.name
 >250-esmtp-resp
 >250-PIPELINING
->250-PIPE_CONNECT
+>250-PIPECONNECT
 >250 ok
 <MAIL FROM:<CALLER@the.local.host.name>
 >250 mail-from accepted
@@ -148,7 +148,7 @@ Connection request from [127.0.0.1]
 >220 banner
 >250-esmtp-resp
 >250-PIPELINING
->250-PIPE_CONNECT
+>250-PIPECONNECT
 >250 ok
 >250 mail good
 >250 rcpt good
@@ -167,7 +167,7 @@ Connection request from [127.0.0.1]
 >220 banner
 >250-esmtp-resp
 >250-PIPELINING
->250-PIPE_CONNECT
+>250-PIPECONNECT
 >250 ok
 >250 mail good
 >550 rcpt refused
@@ -186,7 +186,7 @@ Connection request from [127.0.0.1]
 >220 banner
 >250-esmtp-resp
 >250-PIPELINING
->250-PIPE_CONNECT
+>250-PIPECONNECT
 >250 ok
 >550 mail cmd refused
 >550 rcpt cmd rejected - no valid mail
@@ -202,7 +202,7 @@ Connection request from [127.0.0.1]
 <EHLO the.local.host.name
 >250-esmtp-resp
 >250-PIPELINING
->250-PIPE_CONNECT
+>250-PIPECONNECT
 >250 ok
 <MAIL FROM:<CALLER@the.local.host.name>
 >250 mail-from accepted
@@ -232,7 +232,7 @@ Connection request from [127.0.0.1]
 <EHLO the.local.host.name
 >250-esmtp-resp
 >250-PIPELINING
->250-PIPE_CONNECT
+>250-PIPECONNECT
 >250-SIZE
 >250 ok
 <MAIL FROM:<CALLER@the.local.host.name>