From: Jeremy Harris Date: Wed, 25 May 2016 20:11:58 +0000 (+0100) Subject: Renumber testcase X-Git-Tag: exim-4_88_RC1~84^2~4 X-Git-Url: https://git.exim.org/users/jgh/exim.git/commitdiff_plain/1056c33a65d1ff828f5db83c5ba52c67c4da88c5?ds=sidebyside Renumber testcase --- diff --git a/test/confs/0574 b/test/confs/0574 deleted file mode 100644 index 289ed1955..000000000 --- a/test/confs/0574 +++ /dev/null @@ -1,46 +0,0 @@ -# Exim test configuration 0574 - -SERVER = - -exim_path = EXIM_PATH -keep_environment = -host_lookup_order = bydns -spool_directory = DIR/spool -log_file_path = DIR/spool/log/SERVER%slog -gecos_pattern = "" -gecos_name = CALLER_NAME -tls_advertise_hosts = - -log_selector = +received_recipients +sender_on_delivery - -acl_smtp_rcpt = rcpt -queue_only -queue_run_in_order - -#--------------- - -begin acl - -rcpt: - accept - queue = ${if eq {normal}{$local_part} {} {$local_part}} - logwrite = using queue '$queue_name' - -#--------------- - -begin routers - -all: - driver = accept - transport = dump - -#--------------- - -begin transports - -dump: - driver = pipe - command = true - -# End - diff --git a/test/confs/0575 b/test/confs/0575 new file mode 100644 index 000000000..89bc77fb2 --- /dev/null +++ b/test/confs/0575 @@ -0,0 +1,46 @@ +# Exim test configuration 0575 + +SERVER = + +exim_path = EXIM_PATH +keep_environment = +host_lookup_order = bydns +spool_directory = DIR/spool +log_file_path = DIR/spool/log/SERVER%slog +gecos_pattern = "" +gecos_name = CALLER_NAME +tls_advertise_hosts = + +log_selector = +received_recipients +sender_on_delivery + +acl_smtp_rcpt = rcpt +queue_only +queue_run_in_order + +#--------------- + +begin acl + +rcpt: + accept + queue = ${if eq {normal}{$local_part} {} {$local_part}} + logwrite = using queue '$queue_name' + +#--------------- + +begin routers + +all: + driver = accept + transport = dump + +#--------------- + +begin transports + +dump: + driver = pipe + command = true + +# End + diff --git a/test/log/0574 b/test/log/0574 deleted file mode 100644 index 042d10c6e..000000000 --- a/test/log/0574 +++ /dev/null @@ -1,25 +0,0 @@ -1999-03-02 09:44:33 using queue '' -1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local-smtp S=sss for normal@test.ex -1999-03-02 09:44:33 using queue 'alternate' -1999-03-02 09:44:33 10HmaY-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 -qq -1999-03-02 09:44:33 10HmaX-0005vi-00 => normal F= R=all T=dump -1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qq -1999-03-02 09:44:33 Start 'nosuchqueue' queue run: pid=pppp -1999-03-02 09:44:33 End 'nosuchqueue' queue run: pid=pppp -1999-03-02 09:44:33 Start 'alternate' queue run: pid=pppp -1999-03-02 09:44:33 10HmaY-0005vi-00 => alternate F= Q=alternate R=all T=dump -1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -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 - -******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, -q3s, not listening for SMTP -1999-03-02 09:44:33 Start 'lowpri' queue run: pid=pppp -1999-03-02 09:44:33 End 'lowpri' queue run: pid=pppp -1999-03-02 09:44:33 Start 'lowpri' queue run: pid=pppp -1999-03-02 09:44:33 10HmaZ-0005vi-00 => lowpri F= Q=lowpri R=all T=dump -1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 End 'lowpri' queue run: pid=pppp diff --git a/test/log/0575 b/test/log/0575 new file mode 100644 index 000000000..042d10c6e --- /dev/null +++ b/test/log/0575 @@ -0,0 +1,25 @@ +1999-03-02 09:44:33 using queue '' +1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local-smtp S=sss for normal@test.ex +1999-03-02 09:44:33 using queue 'alternate' +1999-03-02 09:44:33 10HmaY-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 -qq +1999-03-02 09:44:33 10HmaX-0005vi-00 => normal F= R=all T=dump +1999-03-02 09:44:33 10HmaX-0005vi-00 Completed +1999-03-02 09:44:33 End queue run: pid=pppp -qq +1999-03-02 09:44:33 Start 'nosuchqueue' queue run: pid=pppp +1999-03-02 09:44:33 End 'nosuchqueue' queue run: pid=pppp +1999-03-02 09:44:33 Start 'alternate' queue run: pid=pppp +1999-03-02 09:44:33 10HmaY-0005vi-00 => alternate F= Q=alternate R=all T=dump +1999-03-02 09:44:33 10HmaY-0005vi-00 Completed +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 + +******** SERVER ******** +1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, -q3s, not listening for SMTP +1999-03-02 09:44:33 Start 'lowpri' queue run: pid=pppp +1999-03-02 09:44:33 End 'lowpri' queue run: pid=pppp +1999-03-02 09:44:33 Start 'lowpri' queue run: pid=pppp +1999-03-02 09:44:33 10HmaZ-0005vi-00 => lowpri F= Q=lowpri R=all T=dump +1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed +1999-03-02 09:44:33 End 'lowpri' queue run: pid=pppp diff --git a/test/scripts/0000-Basic/0574 b/test/scripts/0000-Basic/0574 deleted file mode 100644 index 7fe6ddb05..000000000 --- a/test/scripts/0000-Basic/0574 +++ /dev/null @@ -1,52 +0,0 @@ -# named queues -# Exim test configuration 0574 -# -no_msglog_check -# -exim -bs -MAIL FROM: -RCPT TO: -DATA -Subject: test - -foo -. -RSET -MAIL FROM: -RCPT TO: -DATA -Subject: test - -foo -. -QUIT -**** -# -exim -qq -**** -# -exim -qGnosuchqueue -**** -# -exim -qGalternate -**** -# -# -# -exim -DSERVER=server -qGlowpri/3s -**** -sleep 1 -exim -bs -MAIL FROM: -RCPT TO: -DATA -Subject: test - -foo -. -QUIT -**** -# -sleep 3 -# -killdaemon diff --git a/test/scripts/0000-Basic/0575 b/test/scripts/0000-Basic/0575 new file mode 100644 index 000000000..57c29fe4c --- /dev/null +++ b/test/scripts/0000-Basic/0575 @@ -0,0 +1,52 @@ +# named queues +# Exim test configuration 0575 +# +no_msglog_check +# +exim -bs +MAIL FROM: +RCPT TO: +DATA +Subject: test + +foo +. +RSET +MAIL FROM: +RCPT TO: +DATA +Subject: test + +foo +. +QUIT +**** +# +exim -qq +**** +# +exim -qGnosuchqueue +**** +# +exim -qGalternate +**** +# +# +# +exim -DSERVER=server -qGlowpri/3s +**** +sleep 1 +exim -bs +MAIL FROM: +RCPT TO: +DATA +Subject: test + +foo +. +QUIT +**** +# +sleep 3 +# +killdaemon diff --git a/test/stdout/0574 b/test/stdout/0574 deleted file mode 100644 index 608078ed1..000000000 --- a/test/stdout/0574 +++ /dev/null @@ -1,17 +0,0 @@ -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=10HmaX-0005vi-00 -250 Reset OK -250 OK -250 Accepted -354 Enter message, ending with "." on a line by itself -250 OK id=10HmaY-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=10HmaZ-0005vi-00 -221 the.local.host.name closing connection diff --git a/test/stdout/0575 b/test/stdout/0575 new file mode 100644 index 000000000..608078ed1 --- /dev/null +++ b/test/stdout/0575 @@ -0,0 +1,17 @@ +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=10HmaX-0005vi-00 +250 Reset OK +250 OK +250 Accepted +354 Enter message, ending with "." on a line by itself +250 OK id=10HmaY-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=10HmaZ-0005vi-00 +221 the.local.host.name closing connection