Testsuite: munge for error message sizes in retry records

diff --git a/test/runtest b/test/runtest
index efbd8487774948dadad591aa2c40d74954fd4399..d550998b76dcb707436657703f453a5dddf1b60d 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -1435,6 +1435,19 @@ RESET_AFTER_EXTRA_LINE_READ:
     # so convert them all to "0"
     s%(?<!lsearch)[^ ](?=TESTSUITE/aux-fixed/(?:0414.list[12]|0464.domains)$)%0%;
 
     # so convert them all to "0"
     s%(?<!lsearch)[^ ](?=TESTSUITE/aux-fixed/(?:0414.list[12]|0464.domains)$)%0%;
 

+    # Environment cleaning
+    next if /\w+ in keep_environment\? (yes|no)/;
+
+    # Sizes vary with test hostname
+    s/^cmd buf flush \d+ bytes/cmd buf flush ddd bytes/;
+
+    # Different platforms put different error messages into retry records
+    s/dbfn_write: key=.* datalen \K\d{2,3}$/nn/;
+    s/dbfn_read: size \K\d{2,3}(?= return$)/nnn/;
+
+    # Spool filesystem free space changes on different systems.
+    s/((?:spool|log) directory space =) -?\d+K (inodes =)\s*-?\d+/$1 nnnnnK $2 nnnnn/;
+

     # CONTENT_SCAN
     next if /try option acl_(?:not_)?smtp_mime$/;
 
     # CONTENT_SCAN
     next if /try option acl_(?:not_)?smtp_mime$/;
 


@@ -1485,15 +1498,6 @@ RESET_AFTER_EXTRA_LINE_READ:
     next if /in tls_resumption_hosts\?/;
     next if /RE '.outlook.com/;
 
     next if /in tls_resumption_hosts\?/;
     next if /RE '.outlook.com/;
 

-    # Environment cleaning
-    next if /\w+ in keep_environment\? (yes|no)/;
-
-    # Sizes vary with test hostname
-    s/^cmd buf flush \d+ bytes/cmd buf flush ddd bytes/;
-
-    # Spool filesystem free space changes on different systems.
-    s/((?:spool|log) directory space =) -?\d+K (inodes =)\s*-?\d+/$1 nnnnnK $2 nnnnn/;
-

     # Non-TLS builds have different expansions for received_header_text
     if (s/(with \$received_protocol)\}\} \$\{if def:tls_cipher \{\(\$tls_cipher\)\n$/$1/)
       {
     # Non-TLS builds have different expansions for received_header_text
     if (s/(with \$received_protocol)\}\} \$\{if def:tls_cipher \{\(\$tls_cipher\)\n$/$1/)
       {

diff --git a/test/stderr/0388 b/test/stderr/0388
index 85f5c96665940043a94d8a7e0c8b2d5c10ee6748..4d27e191208595f0014f9ee1d0870c5006c4e23e 100644 (file)
--- a/test/stderr/0388
+++ b/test/stderr/0388
@@ -168,7 +168,7 @@ Processing retry items
   Writing retry data for R:x@y
     first failed=dddd last try=dddd next try=+1 expired=1
     errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@y>: 451 Temporary error
   Writing retry data for R:x@y
     first failed=dddd last try=dddd next try=+1 expired=1
     errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@y>: 451 Temporary error

-  dbfn_write: key=R:x@y datalen 148
+  dbfn_write: key=R:x@y datalen nn

   *@V4NET.0.0.0 in "*"?
    list element: *
    address match test: subject=*@V4NET.0.0.0 pattern=*
   *@V4NET.0.0.0 in "*"?
    list element: *
    address match test: subject=*@V4NET.0.0.0 pattern=*


@@ -184,7 +184,7 @@ Processing retry items
   Writing retry data for T:[V4NET.0.0.0]:V4NET.0.0.0:PORT_S
     first failed=dddd last try=dddd next try=+0 expired=0
     errno=dd more_errno=dd,A Network Error
   Writing retry data for T:[V4NET.0.0.0]:V4NET.0.0.0:PORT_S
     first failed=dddd last try=dddd next try=+0 expired=0
     errno=dd more_errno=dd,A Network Error

-  dbfn_write: key=T:[V4NET.0.0.0]:V4NET.0.0.0:PORT_S datalen 70
+  dbfn_write: key=T:[V4NET.0.0.0]:V4NET.0.0.0:PORT_S datalen nn

   timed out: all retries expired
 LOG: MAIN
   ** x@y: retry timeout exceeded
   timed out: all retries expired
 LOG: MAIN
   ** x@y: retry timeout exceeded

diff --git a/test/stderr/0398 b/test/stderr/0398
index 745b5bb120ae1621880f57414ace8a2609e872ec..bb31becd48d709b254683c7afe1bc61ce98653ad 100644 (file)
--- a/test/stderr/0398
+++ b/test/stderr/0398
@@ -143,7 +143,7 @@ Attempting full verification using callout
  returned from EXIM_DBOPEN: 0xAAAAAAAA
  opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR
  dbfn_read: key=remote
  returned from EXIM_DBOPEN: 0xAAAAAAAA
  opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR
  dbfn_read: key=remote

- dbfn_read: size 40 return
+ dbfn_read: size nnn return

  callout cache: found domain record for remote
  dbfn_read: key=qq@remote
  dbfn_read: null return
  callout cache: found domain record for remote
  dbfn_read: key=qq@remote
  dbfn_read: null return


@@ -178,10 +178,10 @@ cmdlog: '220:EHLO:250:MAIL:250:RCPT:550:QUIT:250'
  EXIM_DBOPEN: file <TESTSUITE/spool/db/callout> dir <TESTSUITE/spool/db> flags=O_RDWR
  returned from EXIM_DBOPEN: 0xAAAAAAAA
  opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR
  EXIM_DBOPEN: file <TESTSUITE/spool/db/callout> dir <TESTSUITE/spool/db> flags=O_RDWR
  returned from EXIM_DBOPEN: 0xAAAAAAAA
  opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR

- dbfn_write: key=remote datalen 40
+ dbfn_write: key=remote datalen nn

  wrote callout cache domain record for remote:
    result=1 postmaster=0 random=0
  wrote callout cache domain record for remote:
    result=1 postmaster=0 random=0

- dbfn_write: key=qq@remote datalen 16
+ dbfn_write: key=qq@remote datalen nn

  wrote negative callout cache address record for qq@remote
  EXIM_DBCLOSE(0xAAAAAAAA)
  closed hints database
  wrote negative callout cache address record for qq@remote
  EXIM_DBCLOSE(0xAAAAAAAA)
  closed hints database


@@ -276,10 +276,10 @@ Attempting full verification using callout
  returned from EXIM_DBOPEN: 0xAAAAAAAA
  opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR
  dbfn_read: key=remote
  returned from EXIM_DBOPEN: 0xAAAAAAAA
  opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR
  dbfn_read: key=remote

- dbfn_read: size 40 return
+ dbfn_read: size nnn return

  callout cache: found domain record for remote
  dbfn_read: key=qq@remote
  callout cache: found domain record for remote
  dbfn_read: key=qq@remote

- dbfn_read: size 16 return
+ dbfn_read: size nnn return

  callout cache: found address record for qq@remote
  callout cache: address record is negative
  EXIM_DBCLOSE(0xAAAAAAAA)
  callout cache: found address record for qq@remote
  callout cache: address record is negative
  EXIM_DBCLOSE(0xAAAAAAAA)

diff --git a/test/stderr/0432 b/test/stderr/0432
index 2e0719788502c28eceae8a84a94436588a237589..1f17d175df4e8e7bee45cdfa1b45f84cc94c9b34 100644 (file)
--- a/test/stderr/0432
+++ b/test/stderr/0432
@@ -131,10 +131,10 @@ cmdlog: '220:EHLO:250:MAIL:250:RCPT:250:QUIT:220'
  EXIM_DBOPEN: file <TESTSUITE/spool/db/callout> dir <TESTSUITE/spool/db> flags=O_RDWR
  returned from EXIM_DBOPEN: 0xAAAAAAAA
  opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR
  EXIM_DBOPEN: file <TESTSUITE/spool/db/callout> dir <TESTSUITE/spool/db> flags=O_RDWR
  returned from EXIM_DBOPEN: 0xAAAAAAAA
  opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR

- dbfn_write: key=y datalen 40
+ dbfn_write: key=y datalen nn

  wrote callout cache domain record for y:
    result=1 postmaster=0 random=0
  wrote callout cache domain record for y:
    result=1 postmaster=0 random=0

- dbfn_write: key=x@y datalen 16
+ dbfn_write: key=x@y datalen nn

  wrote positive callout cache address record for x@y
  EXIM_DBCLOSE(0xAAAAAAAA)
  closed hints database
  wrote positive callout cache address record for x@y
  EXIM_DBCLOSE(0xAAAAAAAA)
  closed hints database


@@ -218,10 +218,10 @@ Attempting full verification using callout
  returned from EXIM_DBOPEN: 0xAAAAAAAA
  opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR
  dbfn_read: key=y
  returned from EXIM_DBOPEN: 0xAAAAAAAA
  opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR
  dbfn_read: key=y

- dbfn_read: size 40 return
+ dbfn_read: size nnn return

  callout cache: found domain record for y
  dbfn_read: key=x@y
  callout cache: found domain record for y
  dbfn_read: key=x@y

- dbfn_read: size 16 return
+ dbfn_read: size nnn return

  callout cache: found address record for x@y
  callout cache: address record is positive
  EXIM_DBCLOSE(0xAAAAAAAA)
  callout cache: found address record for x@y
  callout cache: address record is positive
  EXIM_DBCLOSE(0xAAAAAAAA)

diff --git a/test/stderr/5005 b/test/stderr/5005
index 879ec0ed90acf85fbbaed563faf8bfefa93107fc..4e0da1d2794ad6c3d76ace7be3bbcfc6d8d6ef45 100644 (file)
--- a/test/stderr/5005
+++ b/test/stderr/5005
@@ -564,7 +564,7 @@ Processing retry items
   Writing retry data for T:userx@test.ex
     first failed=dddd last try=dddd next try=+86400 expired=0
     errno=-22 more_errno=dd mailbox is full (MTA-imposed quota exceeded while writing to tmp/MAILDIR.myhost.test.ex)
   Writing retry data for T:userx@test.ex
     first failed=dddd last try=dddd next try=+86400 expired=0
     errno=-22 more_errno=dd mailbox is full (MTA-imposed quota exceeded while writing to tmp/MAILDIR.myhost.test.ex)

-  dbfn_write: key=T:userx@test.ex datalen 154
+  dbfn_write: key=T:userx@test.ex datalen nn

   EXIM_DBCLOSE(0xAAAAAAAA)
   closed hints database
 end of retry processing
   EXIM_DBCLOSE(0xAAAAAAAA)
   closed hints database
 end of retry processing


@@ -698,7 +698,7 @@ search_tidyup called
  returned from EXIM_DBOPEN: 0xAAAAAAAA
  opened hints database TESTSUITE/spool/db/retry: flags=O_RDONLY
  dbfn_read: key=T:userx@test.ex
  returned from EXIM_DBOPEN: 0xAAAAAAAA
  opened hints database TESTSUITE/spool/db/retry: flags=O_RDONLY
  dbfn_read: key=T:userx@test.ex

- dbfn_read: size 154 return
+ dbfn_read: size nnn return

 retry record exists: age=ttt (max 1w)
   time to retry = tttt expired = 0
  EXIM_DBCLOSE(0xAAAAAAAA)
 retry record exists: age=ttt (max 1w)
   time to retry = tttt expired = 0
  EXIM_DBCLOSE(0xAAAAAAAA)


@@ -758,12 +758,12 @@ Processing retry items
    userx@test.ex in "*"? yes (matched "*")
   retry for T:userx@test.ex = * 0 0
   dbfn_read: key=T:userx@test.ex
    userx@test.ex in "*"? yes (matched "*")
   retry for T:userx@test.ex = * 0 0
   dbfn_read: key=T:userx@test.ex

-  dbfn_read: size 154 return
+  dbfn_read: size nnn return

   failing_interval=ttt message_age=ttt
   Writing retry data for T:userx@test.ex
     first failed=dddd last try=dddd next try=+86400 expired=0
     errno=-22 more_errno=dd mailbox is full (MTA-imposed quota exceeded while writing to tmp/MAILDIR.myhost.test.ex)
   failing_interval=ttt message_age=ttt
   Writing retry data for T:userx@test.ex
     first failed=dddd last try=dddd next try=+86400 expired=0
     errno=-22 more_errno=dd mailbox is full (MTA-imposed quota exceeded while writing to tmp/MAILDIR.myhost.test.ex)

-  dbfn_write: key=T:userx@test.ex datalen 154
+  dbfn_write: key=T:userx@test.ex datalen nn

   EXIM_DBCLOSE(0xAAAAAAAA)
   closed hints database
 end of retry processing
   EXIM_DBCLOSE(0xAAAAAAAA)
   closed hints database
 end of retry processing