From 5b9dc1a78bdb837634dd51244a3c68e0b0af3397 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Mon, 1 Jul 2024 09:05:51 +0100 Subject: [PATCH] Testsuite: munge for error message sizes in retry records --- test/runtest | 22 +++++++++++++--------- test/stderr/0388 | 4 ++-- test/stderr/0398 | 10 +++++----- test/stderr/0432 | 8 ++++---- test/stderr/5005 | 8 ++++---- 5 files changed, 28 insertions(+), 24 deletions(-) diff --git a/test/runtest b/test/runtest index efbd84877..d550998b7 100755 --- a/test/runtest +++ b/test/runtest @@ -1435,6 +1435,19 @@ RESET_AFTER_EXTRA_LINE_READ: # so convert them all to "0" s%(?: 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=* @@ -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 - 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 diff --git a/test/stderr/0398 b/test/stderr/0398 index 745b5bb12..bb31becd4 100644 --- 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 - 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 @@ -178,10 +178,10 @@ cmdlog: '220:EHLO:250:MAIL:250:RCPT:550:QUIT:250' EXIM_DBOPEN: file dir 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 - 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 @@ -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 - dbfn_read: size 40 return + dbfn_read: size nnn return 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) diff --git a/test/stderr/0432 b/test/stderr/0432 index 2e0719788..1f17d175d 100644 --- 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 dir 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 - 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 @@ -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 - dbfn_read: size 40 return + dbfn_read: size nnn return 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) diff --git a/test/stderr/5005 b/test/stderr/5005 index 879ec0ed9..4e0da1d27 100644 --- 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) - 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 @@ -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 - 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) @@ -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 - 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) - 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 -- 2.30.2