Merge branch 'master' into 4.next

[exim.git] / test / stderr / 0700

diff --git a/test/stderr/0700 b/test/stderr/0700
index 4531d5e2c406b730b4efd94eadd4a4d596b38ba2..ff03d69cd3c258b6c49ebb02637221d3c6ece6bf 100644 (file)
--- a/test/stderr/0700
+++ b/test/stderr/0700
@@ -1,5 +1,6 @@
 ### A Message ID as it appears in an email:
 ### A Message ID as it appears in the exim log:
+### New-format log message ID
 ### Just the date part of the Message ID:
 ###    The Epoch ...
 ### ... the script was under development at this time ...
@@ -22,25 +23,37 @@ zzzzzzz not parsed
 ### Print date as seconds since the UNIX epoch.
 ### Show the process id too
 ### Override the value of localhost_number set in the exim configuation file
+### hostno too big
 localhost_number > 10
+### hostno negative
+localhost_number must be a number >=0
+### hostno too big
 localhost_number > 16
 ### From here as 701 - 703
 ### Each msg-id type, all zone
 ### All msg-id types, all zones,  localhost_number = 3
+localhost 0 from message-id != given number 3 at DIR/test/eximdir/exim_msgdate line 387.
+localhost 0 from message-id != given number 3 at DIR/test/eximdir/exim_msgdate line 387.
+localhost 19 from message-id != given number 3 at DIR/test/eximdir/exim_msgdate line 387.
+localhost 9 from message-id != given number 3 at DIR/test/eximdir/exim_msgdate line 387.
 ### All msg-id types, all zones,  localhost_number = 13
+localhost 0 from message-id != given number 13 at DIR/test/eximdir/exim_msgdate line 387.
+localhost 0 from message-id != given number 13 at DIR/test/eximdir/exim_msgdate line 387.
+localhost 19 from message-id != given number 13 at DIR/test/eximdir/exim_msgdate line 387.
+localhost 9 from message-id != given number 13 at DIR/test/eximdir/exim_msgdate line 387.
 ### All msg-id types, all zones,  localhost_number = 20
 localhost_number > 16
 localhost_number > 16
 localhost_number > 16
 localhost_number > 16
 ### All msg-id types, all zones,  base=36
-zz is not base 36
 zzzzzz is not base 36
 ### All msg-id types, all zones,  base=62
 
 ******** SERVER ********
 ### A Message ID as it appears in an email:
 ### A Message ID as it appears in the exim log:
+### New-format log message ID
 ### Just the date part of the Message ID:
 ###    The Epoch ...
 ### ... the script was under development at this time ...
@@ -58,6 +71,9 @@ zzzzzz is not base 36
 ### Print date as seconds since the UNIX epoch.
 ### Show the process id too
 ### Override the value of localhost_number set in the exim configuation file
+### hostno too big
+### hostno negative
+### hostno too big
 ### From here as 701 - 703
 ### Each msg-id type, all zone
 ### All msg-id types, all zones,  localhost_number = 3