diff options
author | Jeremy Harris <jgh146exb@wizmail.org> | 2021-04-11 16:39:06 +0100 |
---|---|---|
committer | Jeremy Harris <jgh146exb@wizmail.org> | 2021-04-16 15:38:09 +0100 |
commit | f870028fd26f8ac1a2fcb6e43e0d7d1c76c110ec (patch) | |
tree | edb9c034517753cc6245bd4596e8fa384aacc9c7 /test | |
parent | 5cd1d1356732d96d49a1f7c682d1b8a33b2576f9 (diff) |
Log queue_time and queue_time_overall exclusive of receive time. Bug 2672
Diffstat (limited to 'test')
-rwxr-xr-x | test/runtest | 3 | ||||
-rw-r--r-- | test/stdout/0035 | 7 | ||||
-rw-r--r-- | test/stdout/0245 | 1 | ||||
-rw-r--r-- | test/stdout/0250 | 3 | ||||
-rw-r--r-- | test/stdout/0254 | 3 | ||||
-rw-r--r-- | test/stdout/0311 | 2 | ||||
-rw-r--r-- | test/stdout/0338 | 1 | ||||
-rw-r--r-- | test/stdout/0377 | 1 | ||||
-rw-r--r-- | test/stdout/0378 | 1 | ||||
-rw-r--r-- | test/stdout/0379 | 1 | ||||
-rw-r--r-- | test/stdout/0389 | 1 | ||||
-rw-r--r-- | test/stdout/0488 | 1 | ||||
-rw-r--r-- | test/stdout/0490 | 1 | ||||
-rw-r--r-- | test/stdout/0514 | 1 | ||||
-rw-r--r-- | test/stdout/3415 | 5 |
15 files changed, 31 insertions, 1 deletions
diff --git a/test/runtest b/test/runtest index 6050411ed..8ebba5023 100755 --- a/test/runtest +++ b/test/runtest @@ -1007,7 +1007,8 @@ RESET_AFTER_EXTRA_LINE_READ: s/conversion: german.xn--strae-oqa.de/conversion: german.straße.de/; # subsecond timstamp info in reported header-files - s/^(-received_time_usec \.)\d{6}$/$1uuuuuu/; + s/^-received_time_usec \.\K\d{6}$/uuuuuu/; + s/^-received_time_complete \K\d+\.\d{6}$/tttt.uuuuuu/; # Postgres server takes varible time to shut down; lives in various places s/^waiting for server to shut down\.+ done$/waiting for server to shut down.... done/; diff --git a/test/stdout/0035 b/test/stdout/0035 index 09b5df4e9..94b08fcd6 100644 --- a/test/stdout/0035 +++ b/test/stdout/0035 @@ -145,6 +145,7 @@ EXIMUSER EXIM_UID EXIM_GID <notsubmit@y> ddddddddd 0 -received_time_usec .uuuuuu +-received_time_complete tttt.uuuuuu --helo_name rhu.barb -host_address 127.0.0.1.9999 -interface_address 127.0.0.1.1225 @@ -166,6 +167,7 @@ EXIMUSER EXIM_UID EXIM_GID <a@y> ddddddddd 0 -received_time_usec .uuuuuu +-received_time_complete tttt.uuuuuu --helo_name rhu.barb -host_address 127.0.0.1.9999 -interface_address 127.0.0.1.1225 @@ -190,6 +192,7 @@ EXIMUSER EXIM_UID EXIM_GID <> ddddddddd 0 -received_time_usec .uuuuuu +-received_time_complete tttt.uuuuuu --helo_name rhu.barb -host_address 127.0.0.1.9999 -interface_address 127.0.0.1.1225 @@ -212,6 +215,7 @@ EXIMUSER EXIM_UID EXIM_GID <notsubmit@y> ddddddddd 0 -received_time_usec .uuuuuu +-received_time_complete tttt.uuuuuu --helo_name rhu.barb -host_address 127.0.0.1.9999 -interface_address 127.0.0.1.1225 @@ -234,6 +238,7 @@ EXIMUSER EXIM_UID EXIM_GID <a@y> ddddddddd 0 -received_time_usec .uuuuuu +-received_time_complete tttt.uuuuuu --helo_name rhu.barb -host_address 127.0.0.1.9999 -interface_address 127.0.0.1.1225 @@ -259,6 +264,7 @@ EXIMUSER EXIM_UID EXIM_GID <a@y> ddddddddd 0 -received_time_usec .uuuuuu +-received_time_complete tttt.uuuuuu --helo_name rhu.barb -host_address 127.0.0.1.9999 -interface_address 127.0.0.1.1225 @@ -284,6 +290,7 @@ EXIMUSER EXIM_UID EXIM_GID <a@y> ddddddddd 0 -received_time_usec .uuuuuu +-received_time_complete tttt.uuuuuu --helo_name rhu.barb -host_address 127.0.0.1.9999 -interface_address 127.0.0.1.1225 diff --git a/test/stdout/0245 b/test/stdout/0245 index 5d0f2df34..da28e7e94 100644 --- a/test/stdout/0245 +++ b/test/stdout/0245 @@ -8,6 +8,7 @@ CALLER UID GID <CALLER@myhost.test.ex> ddddddddd 0 -received_time_usec .uuuuuu +-received_time_complete tttt.uuuuuu -ident CALLER -received_protocol local -body_linecount 1 diff --git a/test/stdout/0250 b/test/stdout/0250 index c19185e84..d4d723725 100644 --- a/test/stdout/0250 +++ b/test/stdout/0250 @@ -3,6 +3,7 @@ CALLER UID GID <CALLER-rewritten@test.ex> ddddddddd 0 -received_time_usec .uuuuuu +-received_time_complete tttt.uuuuuu -ident CALLER -received_protocol local -body_linecount 0 @@ -34,6 +35,7 @@ CALLER UID GID <CALLER-rewritten@test.ex> ddddddddd 0 -received_time_usec .uuuuuu +-received_time_complete tttt.uuuuuu -ident CALLER -received_protocol local -body_linecount 0 @@ -65,6 +67,7 @@ CALLER UID GID <CALLER-rewritten@test.ex> ddddddddd 0 -received_time_usec .uuuuuu +-received_time_complete tttt.uuuuuu -ident CALLER -received_protocol local -body_linecount 0 diff --git a/test/stdout/0254 b/test/stdout/0254 index 69b80a192..1fcd3fd45 100644 --- a/test/stdout/0254 +++ b/test/stdout/0254 @@ -3,6 +3,7 @@ CALLER UID GID <CALLER@myhost.test.ex> ddddddddd 0 -received_time_usec .uuuuuu +-received_time_complete tttt.uuuuuu -ident CALLER -received_protocol local -body_linecount 0 @@ -40,6 +41,7 @@ CALLER UID GID <CALLER@myhost.test.ex> ddddddddd 0 -received_time_usec .uuuuuu +-received_time_complete tttt.uuuuuu -ident CALLER -received_protocol local -body_linecount 0 @@ -70,6 +72,7 @@ CALLER UID GID <CALLER@myhost.test.ex> ddddddddd 0 -received_time_usec .uuuuuu +-received_time_complete tttt.uuuuuu -ident CALLER -received_protocol local -body_linecount 0 diff --git a/test/stdout/0311 b/test/stdout/0311 index 960e8e0b7..a26b24c55 100644 --- a/test/stdout/0311 +++ b/test/stdout/0311 @@ -3,6 +3,7 @@ CALLER UID GID <CALLER@myhost.test.ex> ddddddddd 0 -received_time_usec .uuuuuu +-received_time_complete tttt.uuuuuu -ident CALLER -received_protocol local -body_linecount 0 @@ -32,6 +33,7 @@ CALLER UID GID <CALLER@myhost.test.ex> ddddddddd 0 -received_time_usec .uuuuuu +-received_time_complete tttt.uuuuuu -ident CALLER -received_protocol local -body_linecount 0 diff --git a/test/stdout/0338 b/test/stdout/0338 index fbbbc69c5..06aab63cf 100644 --- a/test/stdout/0338 +++ b/test/stdout/0338 @@ -7,6 +7,7 @@ CALLER UID GID <CALLER@test.ex> ddddddddd 0 -received_time_usec .uuuuuu +-received_time_complete tttt.uuuuuu -ident CALLER -received_protocol local -body_linecount 0 diff --git a/test/stdout/0377 b/test/stdout/0377 index de1e5e305..f6d8fc6f6 100644 --- a/test/stdout/0377 +++ b/test/stdout/0377 @@ -3,6 +3,7 @@ CALLER UID GID <CALLER@myhost.test.ex> ddddddddd 0 -received_time_usec .uuuuuu +-received_time_complete tttt.uuuuuu -ident CALLER -received_protocol local -body_linecount 0 diff --git a/test/stdout/0378 b/test/stdout/0378 index c60701cbc..e163ed170 100644 --- a/test/stdout/0378 +++ b/test/stdout/0378 @@ -3,6 +3,7 @@ CALLER UID GID <CALLER@myhost.test.ex> ddddddddd 0 -received_time_usec .uuuuuu +-received_time_complete tttt.uuuuuu -ident CALLER -received_protocol local -body_linecount 0 diff --git a/test/stdout/0379 b/test/stdout/0379 index d26d23523..d3bd25e7b 100644 --- a/test/stdout/0379 +++ b/test/stdout/0379 @@ -3,6 +3,7 @@ CALLER UID GID <CALLER@myhost.test.ex> ddddddddd 0 -received_time_usec .uuuuuu +-received_time_complete tttt.uuuuuu -ident CALLER -received_protocol local -body_linecount 0 diff --git a/test/stdout/0389 b/test/stdout/0389 index bb5977af7..758f2614d 100644 --- a/test/stdout/0389 +++ b/test/stdout/0389 @@ -9,6 +9,7 @@ CALLER UID GID <CALLER@myhost.test.ex> ddddddddd 0 -received_time_usec .uuuuuu +-received_time_complete tttt.uuuuuu -ident CALLER -received_protocol local-smtp -aclm 0 22 diff --git a/test/stdout/0488 b/test/stdout/0488 index d6d3b4b18..680def49c 100644 --- a/test/stdout/0488 +++ b/test/stdout/0488 @@ -9,6 +9,7 @@ CALLER UID GID <CALLER@myhost.test.ex> ddddddddd 0 -received_time_usec .uuuuuu +-received_time_complete tttt.uuuuuu -ident CALLER -received_protocol local-smtp -body_linecount 0 diff --git a/test/stdout/0490 b/test/stdout/0490 index ee77a71e6..cc71d26e1 100644 --- a/test/stdout/0490 +++ b/test/stdout/0490 @@ -13,6 +13,7 @@ CALLER UID GID <CALLER@myhost.test.ex> ddddddddd 0 -received_time_usec .uuuuuu +-received_time_complete tttt.uuuuuu -ident CALLER -received_protocol local-smtp -body_linecount 2 diff --git a/test/stdout/0514 b/test/stdout/0514 index 5b8677c65..913378aef 100644 --- a/test/stdout/0514 +++ b/test/stdout/0514 @@ -6,6 +6,7 @@ CALLER UID GID <"spaced user"@myhost.test.ex> ddddddddd 0 -received_time_usec .uuuuuu +-received_time_complete tttt.uuuuuu -ident spaced user -received_protocol local -body_linecount 1 diff --git a/test/stdout/3415 b/test/stdout/3415 index d806fa66c..7c6e90bdb 100644 --- a/test/stdout/3415 +++ b/test/stdout/3415 @@ -156,6 +156,7 @@ EXIMUSER EXIM_UID EXIM_GID <username@myhost.test.ex> ddddddddd 0 -received_time_usec .uuuuuu +-received_time_complete tttt.uuuuuu --helo_name rhu.barb -host_address 127.0.0.1.9999 -host_auth au1 @@ -184,6 +185,7 @@ EXIMUSER EXIM_UID EXIM_GID <> ddddddddd 0 -received_time_usec .uuuuuu +-received_time_complete tttt.uuuuuu --helo_name rhu.barb -host_address 127.0.0.1.9999 -host_auth au1 @@ -210,6 +212,7 @@ EXIMUSER EXIM_UID EXIM_GID <> ddddddddd 0 -received_time_usec .uuuuuu +-received_time_complete tttt.uuuuuu --helo_name rhu.barb -host_address 127.0.0.1.9999 -host_auth au1 @@ -236,6 +239,7 @@ EXIMUSER EXIM_UID EXIM_GID <> ddddddddd 0 -received_time_usec .uuuuuu +-received_time_complete tttt.uuuuuu --helo_name rhu.barb -host_address 127.0.0.1.9999 -host_auth au1 @@ -262,6 +266,7 @@ EXIMUSER EXIM_UID EXIM_GID <> ddddddddd 0 -received_time_usec .uuuuuu +-received_time_complete tttt.uuuuuu --helo_name rhu.barb -host_address 127.0.0.1.9999 -host_auth au1 |