diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2019-01-01 16:21:02 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2019-02-12 11:54:42 +0000 |
| commit | 049782c0de52a217f78116f82b3a1d69c0667458 (patch) | |
| tree | 222076f2fbeeff37f578b2ccdc3f465183e1b93e /test | |
| parent | c8f419afe4b673ce93b7db07eb3093d8a07afb5f (diff) | |
Logging: created Message-IDs. Selectors for created and all IDs. Bugs 219, 1840, 2339
Diffstat (limited to 'test')
| -rw-r--r-- | test/confs/0619 | 26 | ||||
| -rw-r--r-- | test/log/0619 | 10 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0619 | 45 |
3 files changed, 81 insertions, 0 deletions
diff --git a/test/confs/0619 b/test/confs/0619 new file mode 100644 index 000000000..dc23661ac --- /dev/null +++ b/test/confs/0619 @@ -0,0 +1,26 @@ +# Exim test configuration 0619 + +LOG_SELECTOR= + +keep_environment = PATH +exim_path = EXIM_PATH +spool_directory = DIR/spool + +log_file_path = DIR/spool/log/%slog + +gecos_pattern = "" +gecos_name = CALLER_NAME +chunking_advertise_hosts = +tls_advertise_hosts = + +primary_hostname = myhost.test.ex +queue_only + +# ----- Main settings ----- + +log_selector = LOG_SELECTOR + +acl_not_smtp = accept + + +# End diff --git a/test/log/0619 b/test/log/0619 new file mode 100644 index 000000000..36354ac56 --- /dev/null +++ b/test/log/0619 @@ -0,0 +1,10 @@ +1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss id=original1235@example.com for a@test.ex +1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for b@test.ex +1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss id*=E10HmaZ-0005vi-00@myhost.test.ex for c@test.ex +1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss id=original1235@example.com for d@test.ex +1999-03-02 09:44:33 10HmaX-0005vi-00 ** a@test.ex: Unrouteable address +1999-03-02 09:44:33 10HmbB-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss for CALLER@myhost.test.ex +1999-03-02 09:44:33 10HmaX-0005vi-00 Completed +1999-03-02 09:44:33 10HmaY-0005vi-00 ** b@test.ex: Unrouteable address +1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> R=10HmaY-0005vi-00 U=EXIMUSER P=local S=sss id*=E10HmbC-0005vi-00@myhost.test.ex for CALLER@myhost.test.ex +1999-03-02 09:44:33 10HmaY-0005vi-00 Completed diff --git a/test/scripts/0000-Basic/0619 b/test/scripts/0000-Basic/0619 new file mode 100644 index 000000000..196b9dc0c --- /dev/null +++ b/test/scripts/0000-Basic/0619 @@ -0,0 +1,45 @@ +# log_selector msg_id and msg_id_created +# +# msg_id is on by default; check baseline +exim -DLOG_SELECTOR=+received_recipients -t +From: CALLER@test.ex +To: a@test.ex +Message-ID: original1235@example.com + +body +**** +# +# msg_id is on by default; check it can be disabled +exim -DLOG_SELECTOR=+received_recipients-msg_id -t +From: CALLER@test.ex +To: b@test.ex +Message-ID: original1235@example.com + +body +**** +# +# check msg_id_created shows invented ones +exim -DLOG_SELECTOR=+received_recipients+msg_id_created -t +From: CALLER@test.ex +To: c@test.ex + +body +**** +# +# check msg_id_created ignores non-invented ones +exim -DLOG_SELECTOR=+received_recipients+msg_id_created -t +From: CALLER@test.ex +To: d@test.ex +Message-ID: original1235@example.com + +body +**** +# +# check that bounces don't log created, by default +exim -DLOG_SELECTOR=+received_recipients -M $msg1 +**** +# and check they do with msg_id_created +exim -DLOG_SELECTOR=+received_recipients+msg_id_created -M $msg1 +**** +# +no_msglog_check |