diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2017-10-21 18:36:31 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2017-10-21 18:51:55 +0100 |
| commit | d097cc730a1ab358bad80338b30b49287d1274c3 (patch) | |
| tree | d84b16fd24be703e53d39bc195e8d957149b7d94 /test | |
| parent | e5ab0ba9eb0f4424dfa31128f36b27b6769d7795 (diff) | |
Testsuite: make debug output for proxied TLS less indeterminate
Diffstat (limited to 'test')
| -rwxr-xr-x | test/runtest | 3 | ||||
| -rw-r--r-- | test/stderr/2035 | 4 | ||||
| -rw-r--r-- | test/stderr/2135 | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/test/runtest b/test/runtest index 8f5d393bb..5fbf1d3fe 100755 --- a/test/runtest +++ b/test/runtest @@ -925,9 +925,10 @@ RESET_AFTER_EXTRA_LINE_READ: s/^Exim version .*/Exim version x.yz ..../; - # Debugging lines for Exim terminations + # Debugging lines for Exim terminations and process-generation s/(?<=^>>>>>>>>>>>>>>>> Exim pid=)\d+(?= terminating)/pppp/; + s/^(proxy-proc \w{5}-pid) \d+$/$1 pppp/; # IP address lookups use gethostbyname() when IPv6 is not supported, # and gethostbyname2() or getipnodebyname() when it is. diff --git a/test/stderr/2035 b/test/stderr/2035 index 3b6cb2824..80c2476d8 100644 --- a/test/stderr/2035 +++ b/test/stderr/2035 @@ -36,6 +36,8 @@ LOG: MAIN LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>> +proxy-proc inter-pid pppp +proxy-proc final-pid pppp Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -64,11 +66,11 @@ ok=1 send_quit=1 send_rset=0 continue_more=0 yield=0 first_address is NULL cmd buf flush ddd bytes SMTP(close)>> Leaving t1 transport ->>>>>>>>>>>>>>>> Exim pid=pppp (TLS proxy) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: MAIN => userb@test.ex R=client T=t1 H=127.0.0.1 [127.0.0.1]:1225 X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no C="250 OK id=10HmaY-0005vi-00" LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (TLS proxy) terminating with rc=0 >>>>>>>>>>>>>>>> ******** SERVER ******** diff --git a/test/stderr/2135 b/test/stderr/2135 index 32e0d013e..e7e1c3f65 100644 --- a/test/stderr/2135 +++ b/test/stderr/2135 @@ -36,6 +36,8 @@ LOG: MAIN LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>> +proxy-proc inter-pid pppp +proxy-proc final-pid pppp Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -64,11 +66,11 @@ ok=1 send_quit=1 send_rset=0 continue_more=0 yield=0 first_address is NULL cmd buf flush ddd bytes SMTP(close)>> Leaving t1 transport ->>>>>>>>>>>>>>>> Exim pid=pppp (TLS proxy) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: MAIN => userb@test.ex R=client T=t1 H=127.0.0.1 [127.0.0.1]:1225 X=TLSv1:AES256-SHA:256 CV=no C="250 OK id=10HmaY-0005vi-00" LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (TLS proxy) terminating with rc=0 >>>>>>>>>>>>>>>> ******** SERVER ******** |