From 4e192008ab7db2b7b9f157bba50f71a46e1a0cd9 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Fri, 14 Oct 2016 13:57:01 +0100 Subject: [PATCH] Testsuite: (named queues) add testcase for 3rd-party queue transfer --- test/log/0576 | 6 ++++++ test/runtest | 2 +- test/scripts/0000-Basic/0576 | 17 +++++++++++++++-- test/stdout/0576 | 6 ++++++ 4 files changed, 28 insertions(+), 3 deletions(-) diff --git a/test/log/0576 b/test/log/0576 index 373f1d320..8c1cb73df 100644 --- a/test/log/0576 +++ b/test/log/0576 @@ -14,6 +14,12 @@ 1999-03-02 09:44:33 End 'alternate' queue run: pid=pppp 1999-03-02 09:44:33 using queue 'lowpri' 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local-smtp S=sss Q=lowpri for lowpri@test.ex +1999-03-02 09:44:33 using queue 'alternate' +1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local-smtp S=sss Q=alternate for alternate@test.ex +1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 10HmbA-0005vi-00 => alternate F= R=all T=dump +1999-03-02 09:44:33 10HmbA-0005vi-00 Completed +1999-03-02 09:44:33 End queue run: pid=pppp ******** SERVER ******** 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, -qGlowpri/3s, not listening for SMTP diff --git a/test/runtest b/test/runtest index b4c66840a..e2ce876f0 100755 --- a/test/runtest +++ b/test/runtest @@ -1969,7 +1969,7 @@ if (/^sleep\s+(.*)$/) # Various Unix management commands are recognized if (/^(ln|ls|du|mkdir|mkfifo|touch|cp|cat)\s/ || - /^sudo\s(rmdir|rm|chown|chmod)\s/) + /^sudo\s(rmdir|rm|mv|chown|chmod)\s/) { run_system("$_ >>test-stdout 2>>test-stderr"); return 1; diff --git a/test/scripts/0000-Basic/0576 b/test/scripts/0000-Basic/0576 index 144f02c48..6f01d9aae 100644 --- a/test/scripts/0000-Basic/0576 +++ b/test/scripts/0000-Basic/0576 @@ -46,7 +46,20 @@ foo . QUIT **** -# sleep 3 -# killdaemon +# +# third-party queue transfer +exim -bs +MAIL FROM: +RCPT TO: +DATA +Subject: test + +foo +. +QUIT +**** +# +sudo mv DIR/spool/alternate/input/* DIR/spool/input/ +exim -q diff --git a/test/stdout/0576 b/test/stdout/0576 index 608078ed1..527865b62 100644 --- a/test/stdout/0576 +++ b/test/stdout/0576 @@ -15,3 +15,9 @@ 354 Enter message, ending with "." on a line by itself 250 OK id=10HmaZ-0005vi-00 221 the.local.host.name closing connection +220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +250 OK +250 Accepted +354 Enter message, ending with "." on a line by itself +250 OK id=10HmbA-0005vi-00 +221 the.local.host.name closing connection -- 2.25.1