From a9231f68f7c21597260c867dc6f7ad6207a4baf1 Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Mon, 4 Apr 2022 23:12:44 +0100
Subject: [PATCH] Testsuite: account for changed feature name

Broken-by: a375c22c1d
---
 test/scripts/4050-pipe-conn/4050              | 10 +++++-----
 test/scripts/4050-pipe-conn/4052              | 18 ++++++++---------
 test/scripts/4050-pipe-conn/REQUIRES          |  2 +-
 test/scripts/4056-pipe-conn-auth/REQUIRES     |  2 +-
 test/scripts/4058-pipe-conn-tfo/REQUIRES      |  2 +-
 test/scripts/4060-pipe-conn-gnutls/REQUIRES   |  2 +-
 test/scripts/4062-pipe-conn-openssl/REQUIRES  |  2 +-
 .../4064-pipe-conn-gnutls-auth/REQUIRES       |  2 +-
 .../4066-pipe-conn-openssl-auth/REQUIRES      |  2 +-
 .../4068-pipe-conn-gnutls-tfo/REQUIRES        |  2 +-
 .../4069-pipe-conn-openssl-tfo/REQUIRES       |  2 +-
 test/stderr/4052                              |  6 ++++--
 test/stdout/4050                              | 20 +++++++++----------
 test/stdout/4052                              | 18 ++++++++---------
 14 files changed, 46 insertions(+), 44 deletions(-)

diff --git a/test/scripts/4050-pipe-conn/4050 b/test/scripts/4050-pipe-conn/4050
index 9b06defbb..a969b3f85 100644
--- 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 8ee494744..ba550fd6c 100644
--- 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 1b9b3f83c..52f2130d5 100644
--- 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 5d02ef731..77e749892 100644
--- 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 5136f5257..01b20f127 100644
--- 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 9c2dba1fb..d31cf00db 100644
--- 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 14cbb1305..48c1d7d46 100644
--- 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 a7b932236..5bfda90ba 100644
--- 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 502171d90..6c09cd0f4 100644
--- 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 7531f8c26..466951033 100644
--- 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 b8d0734b3..eb7686bbc 100644
--- 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 4c0c1b1ca..72841ee1f 100644
--- 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 9e78c5f74..00dd50200 100644
--- 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 c84be25a5..63a12c926 100644
--- 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>
-- 
2.30.2