From b2fedb773ca5b29f143368045d430d7032aed1df Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Tue, 15 Oct 2019 23:08:31 +0100 Subject: [PATCH 1/1] Testsuite: output changes resulting Broken-by: 2e5d9e711e --- test/log/5655 | 6 +++--- test/stderr/0092 | 1 + test/stderr/0402 | 2 ++ test/stderr/0544 | 3 +++ test/stderr/3000 | 1 + test/stderr/5410 | 3 +++ test/stderr/5420 | 3 +++ test/stdout/0572 | 6 ++++-- test/stdout/0577 | 3 ++- 9 files changed, 22 insertions(+), 6 deletions(-) diff --git a/test/log/5655 b/test/log/5655 index 4cb16c24c..9275ad1a5 100644 --- a/test/log/5655 +++ b/test/log/5655 @@ -15,13 +15,13 @@ ******** SERVER ******** 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -1999-03-02 09:44:33 +1999-03-02 09:44:33 TESTSUITE/spool/sslkeys 1999-03-02 09:44:33 acl_mail: ocsp in status: 4 (verified) 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> H=localhost (server1.example.com) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@server1.example.com 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -1999-03-02 09:44:33 +1999-03-02 09:44:33 TESTSUITE/spool/sslkeys 1999-03-02 09:44:33 acl_mail: ocsp in status: 1 (notresp) 1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> H=localhost (server1.example.com) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@server1.example.com 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -1999-03-02 09:44:33 +1999-03-02 09:44:33 TESTSUITE/spool/sslkeys 1999-03-02 09:44:33 TLS error on connection from localhost [127.0.0.1] (recv): The TLS connection was non-properly terminated. diff --git a/test/stderr/0092 b/test/stderr/0092 index 715ca795c..7db741e6d 100644 --- a/test/stderr/0092 +++ b/test/stderr/0092 @@ -35,6 +35,7 @@ LOG: SMTP data timeout (message abandoned) on connection from [V4NET.0.0.1] F=>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys configuration file is TESTSUITE/test-config admin user LOG: smtp_connection MAIN diff --git a/test/stderr/3000 b/test/stderr/3000 index 9ba2a62a2..49b5e51b7 100644 --- a/test/stderr/3000 +++ b/test/stderr/3000 @@ -1,5 +1,6 @@ 1999-03-02 09:44:33 this is a warning at TESTSUITE/aux-fixed/3000.pl line 25. Exim version x.yz .... +adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid diff --git a/test/stderr/5410 b/test/stderr/5410 index a554fd953..391d5f204 100644 --- a/test/stderr/5410 +++ b/test/stderr/5410 @@ -1,4 +1,5 @@ Exim version x.yz .... +adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys configuration file is TESTSUITE/test-config admin user in hosts_connection_nolog? no (option unset) @@ -274,6 +275,7 @@ LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys configuration file is TESTSUITE/test-config admin user in hosts_connection_nolog? no (option unset) @@ -517,6 +519,7 @@ LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys configuration file is TESTSUITE/test-config admin user in hosts_connection_nolog? no (option unset) diff --git a/test/stderr/5420 b/test/stderr/5420 index 9aefc2431..5d7aced0e 100644 --- a/test/stderr/5420 +++ b/test/stderr/5420 @@ -1,4 +1,5 @@ Exim version x.yz .... +adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys configuration file is TESTSUITE/test-config admin user in hosts_connection_nolog? no (option unset) @@ -275,6 +276,7 @@ LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys configuration file is TESTSUITE/test-config admin user in hosts_connection_nolog? no (option unset) @@ -518,6 +520,7 @@ LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys configuration file is TESTSUITE/test-config admin user in hosts_connection_nolog? no (option unset) diff --git a/test/stdout/0572 b/test/stdout/0572 index 44ced8ce3..b315ec6d3 100644 --- a/test/stdout/0572 +++ b/test/stdout/0572 @@ -78,7 +78,8 @@ OPT = # 1 "TESTSUITE/aux-var/std_conf_prefix" # 1 "TESTSUITE/aux-var/std_conf_prefix" # 1 "TESTSUITE/aux-var/tls_conf_prefix" -keep_environment = PATH:SSLKEYLOGFILE:EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK +keep_environment = PATH:EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK +add_environment = SSLKEYLOGFILE=TESTSUITE/spool/sslkeys exim_path = TESTSUITE/eximdir/exim host_lookup_order = bydns spool_directory = TESTSUITE/spool @@ -118,7 +119,8 @@ OPT = # 1 "TESTSUITE/aux-var/std_conf_prefix" # 1 "TESTSUITE/aux-var/std_conf_prefix" # 1 "TESTSUITE/aux-var/tls_conf_prefix" -keep_environment = PATH:SSLKEYLOGFILE:EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK +keep_environment = PATH:EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK +add_environment = SSLKEYLOGFILE=TESTSUITE/spool/sslkeys exim_path = TESTSUITE/eximdir/exim host_lookup_order = bydns spool_directory = TESTSUITE/spool diff --git a/test/stdout/0577 b/test/stdout/0577 index 7a0cb7a82..a56ec1b62 100644 --- a/test/stdout/0577 +++ b/test/stdout/0577 @@ -4,7 +4,8 @@ # 1 "TESTSUITE/aux-var/std_conf_prefix" # 1 "TESTSUITE/aux-var/std_conf_prefix" # 1 "TESTSUITE/aux-var/tls_conf_prefix" -keep_environment = PATH:SSLKEYLOGFILE:EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK +keep_environment = PATH:EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK +add_environment = SSLKEYLOGFILE=TESTSUITE/spool/sslkeys exim_path = TESTSUITE/eximdir/exim host_lookup_order = bydns spool_directory = TESTSUITE/spool -- 2.25.1