Gitweb:
https://git.exim.org/exim.git/commitdiff/798f6588bc18ec6a36ada846406e98d4e0ec9df9
Commit: 798f6588bc18ec6a36ada846406e98d4e0ec9df9
Parent: 1950cf85b47f7c8407b3318a4f8fc57c0af6d6ba
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Wed Apr 22 21:05:55 2020 +0100
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Wed Apr 22 21:05:55 2020 +0100
Testsuite: more tidying for Alpine
---
test/dnszones-src/db.test.ex._bad | 8 ++++++++
test/log/2102 | 6 +++---
test/log/2102.openssl_1_1_1 | 6 +++---
test/mail/2102.CALLER | 12 ++++++------
test/scripts/0000-Basic/0078 | 2 +-
test/scripts/0000-Basic/0161 | 2 +-
test/scripts/0000-Basic/0557 | 18 +++++++++---------
test/scripts/2100-OpenSSL/2102 | 6 +++---
test/stderr/0078 | 10 +++++-----
test/stderr/0161 | 12 ++++++------
test/stdout/0078 | 2 +-
test/stdout/0161 | 2 +-
test/stdout/2102 | 6 +++---
13 files changed, 50 insertions(+), 42 deletions(-)
diff --git a/test/dnszones-src/db.test.ex._bad b/test/dnszones-src/db.test.ex._bad
new file mode 100644
index 0000000..7e4532a
--- /dev/null
+++ b/test/dnszones-src/db.test.ex._bad
@@ -0,0 +1,8 @@
+# A really denuded zone, just to give the testsuite something to hit so the fakens
+# program returns not-found rather than pass-on.
+
+test.ex._bad. NS exim.test.ex._bad.
+test.ex._bad. SOA exim.test.ex._bad. hostmaster.exim.test.ex_bad 1430683638 1200 120 604800 3000
+
+
+; End
diff --git a/test/log/2102 b/test/log/2102
index dfcfc1b..d66cc00 100644
--- a/test/log/2102
+++ b/test/log/2102
@@ -13,7 +13,7 @@
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
1999-03-02 09:44:33 Our cert SN: <CN=server1.example_ec.com>
1999-03-02 09:44:33 Peer did not present a cert
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? H=[127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= a@??? H=[127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss
1999-03-02 09:44:33 Our cert SN: <CN=server1.example_ec.com>
1999-03-02 09:44:33 Peer did not present a cert
1999-03-02 09:44:33 10HmaY-0005vi-00 <= "name with spaces"@??? H=[127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss
@@ -42,8 +42,8 @@
1999-03-02 09:44:33 cipher: TLS1.x:ke-RSA-AES256-SHAnnn:xxx
1999-03-02 09:44:33 cipher_ TLS1.x:ke_RSA_WITH_ci_mac
1999-03-02 09:44:33 ver: TLS1.x
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@??? H=[ip4.ip4.ip4.ip4] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/CN=server2.example.com" S=sss
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= b@??? H=[ip4.ip4.ip4.ip4] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/CN=server2.example.com" S=sss
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
1999-03-02 09:44:33 Our cert SN: <CN=server1.example_ec.com>
1999-03-02 09:44:33 Peer did not present a cert
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@??? H=[127.0.0.1] P=smtps X=TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx CV=no S=sss
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= c@??? H=[127.0.0.1] P=smtps X=TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx CV=no S=sss
diff --git a/test/log/2102.openssl_1_1_1 b/test/log/2102.openssl_1_1_1
index 951caaf..ff99c1b 100644
--- a/test/log/2102.openssl_1_1_1
+++ b/test/log/2102.openssl_1_1_1
@@ -13,7 +13,7 @@
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
1999-03-02 09:44:33 Our cert SN: <CN=server1.example.com>
1999-03-02 09:44:33 Peer did not present a cert
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? H=[127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= a@??? H=[127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss
1999-03-02 09:44:33 Our cert SN: <CN=server1.example.com>
1999-03-02 09:44:33 Peer did not present a cert
1999-03-02 09:44:33 10HmaY-0005vi-00 <= "name with spaces"@??? H=[127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss
@@ -42,8 +42,8 @@
1999-03-02 09:44:33 cipher: TLS1.x:ke-RSA-AES256-SHAnnn:xxx
1999-03-02 09:44:33 cipher_ TLS1.x:ke_RSA_WITH_ci_mac
1999-03-02 09:44:33 ver: TLS1.x
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@??? H=[ip4.ip4.ip4.ip4] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/CN=server2.example.com" S=sss
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= b@??? H=[ip4.ip4.ip4.ip4] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/CN=server2.example.com" S=sss
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
1999-03-02 09:44:33 Our cert SN: <CN=server1.example_ec.com>
1999-03-02 09:44:33 Peer did not present a cert
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@??? H=[127.0.0.1] P=smtps X=TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx CV=no S=sss
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= c@??? H=[127.0.0.1] P=smtps X=TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx CV=no S=sss
diff --git a/test/mail/2102.CALLER b/test/mail/2102.CALLER
index 9ca8239..4f38103 100644
--- a/test/mail/2102.CALLER
+++ b/test/mail/2102.CALLER
@@ -1,8 +1,8 @@
-From CALLER@??? Tue Mar 02 09:44:33 1999
+From a@??? Tue Mar 02 09:44:33 1999
Received: from [127.0.0.1]
by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
- (envelope-from <CALLER@???>)
+ (envelope-from <a@???>)
id 10HmaX-0005vi-00
for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
tls-certificate-verified: 0
@@ -22,11 +22,11 @@ TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
This is a test encrypted message.
-From CALLER@??? Tue Mar 02 09:44:33 1999
+From b@??? Tue Mar 02 09:44:33 1999
Received: from [ip4.ip4.ip4.ip4]
by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
- (envelope-from <CALLER@???>)
+ (envelope-from <b@???>)
id 10HmaZ-0005vi-00
for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
tls-certificate-verified: 1
@@ -34,11 +34,11 @@ TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=/CN=server2.example.com
This is a test encrypted message from a verified host.
-From CALLER@??? Tue Mar 02 09:44:33 1999
+From c@??? Tue Mar 02 09:44:33 1999
Received: from [127.0.0.1]
by myhost.test.ex with smtps (TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx)
(Exim x.yz)
- (envelope-from <CALLER@???>)
+ (envelope-from <c@???>)
id 10HmbA-0005vi-00
for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
tls-certificate-verified: 0
diff --git a/test/scripts/0000-Basic/0078 b/test/scripts/0000-Basic/0078
index 0333aa3..0e336e7 100644
--- a/test/scripts/0000-Basic/0078
+++ b/test/scripts/0000-Basic/0078
@@ -7,4 +7,4 @@ exim -d-all+route -bt myhost.test.ex@???
exim -d-all+route -bt xx@???
****
2
-exim -d-all+route -bt xx@???
+exim -d-all+route -bt xx@???
diff --git a/test/scripts/0000-Basic/0161 b/test/scripts/0000-Basic/0161
index 0d453ea..7908c34 100644
--- a/test/scripts/0000-Basic/0161
+++ b/test/scripts/0000-Basic/0161
@@ -8,7 +8,7 @@ exim -d-all+route -bt myhost.test.ex@???
exim -d-all+route -bt xx@???
****
2
-exim -d-all+route -bt xx@???
+exim -d-all+route -bt xx@???
****
2
exim -d-all+route -bt ff@???
diff --git a/test/scripts/0000-Basic/0557 b/test/scripts/0000-Basic/0557
index 02ab466..ffb85bc 100644
--- a/test/scripts/0000-Basic/0557
+++ b/test/scripts/0000-Basic/0557
@@ -3,26 +3,26 @@
exim -DFAKE=# -DOPT=# -bt userx@???
****
1
-exim -DOPT=# -DHOSTS=a.non.exist -bt userx@???
+exim -DOPT=# -DHOSTS=a.non-exist.test.ex -bt userx@???
****
1
-exim -DOPT=# -DHOSTS=a.non.exist:b.non.exist -bt userx@???
+exim -DOPT=# -DHOSTS=a.non-exist.test.ex:b.non-exist.test.ex -bt userx@???
****
-exim -DOPT=# -DHOSTS=a.non.exist:127.0.0.1 -bt userx@???
+exim -DOPT=# -DHOSTS=a.non-exist.test.ex:127.0.0.1 -bt userx@???
****
-exim -DOPT=# -DHOSTS=127.0.0.1:b.non.exist:127.0.0.2 -bt userx@???
+exim -DOPT=# -DHOSTS=127.0.0.1:b.non-exist.test.ex:127.0.0.2 -bt userx@???
****
1
-exim -DHOSTS=a.non.exist -DHAI=defer -bt userx@???
+exim -DHOSTS=a.non-exist.test.ex -DHAI=defer -bt userx@???
****
2
-exim -DHOSTS=a.non.exist -DHAI=decline -bt userx@???
+exim -DHOSTS=a.non-exist.test.ex -DHAI=decline -bt userx@???
****
2
-exim -DHOSTS=a.non.exist -DHAI=fail -bt userx@???
+exim -DHOSTS=a.non-exist.test.ex -DHAI=fail -bt userx@???
****
-exim -DHOSTS=a.non.exist -DHAI=pass -bt userx@???
+exim -DHOSTS=a.non-exist.test.ex -DHAI=pass -bt userx@???
****
1
-exim -DHOSTS=a.non.exist -DHAI=freeze -bt userx@???
+exim -DHOSTS=a.non-exist.test.ex -DHAI=freeze -bt userx@???
****
diff --git a/test/scripts/2100-OpenSSL/2102 b/test/scripts/2100-OpenSSL/2102
index ade5194..9a9f4d7 100644
--- a/test/scripts/2100-OpenSSL/2102
+++ b/test/scripts/2100-OpenSSL/2102
@@ -22,7 +22,7 @@ ehlo rhu.barb
??? 250
starttls
??? 220
-mail from:<CALLER@???>
+mail from:<a@???>
??? 250
rcpt to:<CALLER@???>
??? 250
@@ -84,7 +84,7 @@ ehlo rhu.barb
??? 250
starttls
??? 220
-mail from:<CALLER@???>
+mail from:<b@???>
??? 250
rcpt to:<CALLER@???>
??? 250
@@ -115,7 +115,7 @@ ehlo rhu.barb
??? 250
starttls
??? 220
-mail from:<CALLER@???>
+mail from:<c@???>
??? 250
rcpt to:<CALLER@???>
??? 250
diff --git a/test/stderr/0078 b/test/stderr/0078
index 5f08f68..ff218e3 100644
--- a/test/stderr/0078
+++ b/test/stderr/0078
@@ -111,14 +111,14 @@ configuration file is TESTSUITE/test-config
admin user
dropping to exim gid; retaining priv uid
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-routing xx@???
+routing xx@???
--------> lookuphost router <--------
-local_part=xx domain=not.exist
+local_part=xx domain=not-exist.test.ex
checking domains
calling lookuphost router
-lookuphost router called for xx@???
- domain = not.exist
-lookuphost router declined for xx@???
+lookuphost router called for xx@???
+ domain = not-exist.test.ex
+lookuphost router declined for xx@???
"more" is false: skipping remaining routers
no more routers
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0161 b/test/stderr/0161
index 9ace15f..5331717 100644
--- a/test/stderr/0161
+++ b/test/stderr/0161
@@ -136,19 +136,19 @@ configuration file is TESTSUITE/test-config
admin user
dropping to exim gid; retaining priv uid
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-routing xx@???
+routing xx@???
--------> failuphost router <--------
-local_part=xx domain=not.exist
+local_part=xx domain=not-exist.test.ex
checking domains
checking local_parts
failuphost router skipped: local_parts mismatch
--------> lookuphost router <--------
-local_part=xx domain=not.exist
+local_part=xx domain=not-exist.test.ex
checking domains
calling lookuphost router
-lookuphost router called for xx@???
- domain = not.exist
-lookuphost router declined for xx@???
+lookuphost router called for xx@???
+ domain = not-exist.test.ex
+lookuphost router declined for xx@???
"more" is false: skipping remaining routers
no more routers
>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>
diff --git a/test/stdout/0078 b/test/stdout/0078
index 483feff..d831fde 100644
--- a/test/stdout/0078
+++ b/test/stdout/0078
@@ -7,4 +7,4 @@ myhost.test.ex@???
xx@???
router = self2, transport = remote_smtp
host myhost.test.ex [V4NET.10.10.10]
-xx@??? is undeliverable: Unrouteable address
+xx@??? is undeliverable: Unrouteable address
diff --git a/test/stdout/0161 b/test/stdout/0161
index b8332fe..4153625 100644
--- a/test/stdout/0161
+++ b/test/stdout/0161
@@ -7,6 +7,6 @@ myhost.test.ex@???
xx@???
router = self2, transport = remote_smtp
host myhost.test.ex [V4NET.10.10.10]
-xx@??? is undeliverable: Unrouteable address
+xx@??? is undeliverable: Unrouteable address
ff@??? is undeliverable: lowest numbered MX record points to local host
fff@??? is undeliverable: lookup of host "fff" failed in fail router
diff --git a/test/stdout/2102 b/test/stdout/2102
index d6a9ab4..ecd88c6 100644
--- a/test/stdout/2102
+++ b/test/stdout/2102
@@ -19,7 +19,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
<<< 220 TLS go ahead
Attempting to start TLS
Succeeded in starting TLS
->>> mail from:<CALLER@???>
+>>> mail from:<a@???>
??? 250
<<< 250 OK
>>> rcpt to:<CALLER@???>
@@ -124,7 +124,7 @@ Key file = TESTSUITE/aux-fixed/exim-ca/example.com/server2.example.com/server2.e
<<< 220 TLS go ahead
Attempting to start TLS
Succeeded in starting TLS
->>> mail from:<CALLER@???>
+>>> mail from:<b@???>
??? 250
<<< 250 OK
>>> rcpt to:<CALLER@???>
@@ -162,7 +162,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
<<< 220 TLS go ahead
Attempting to start TLS
Succeeded in starting TLS
->>> mail from:<CALLER@???>
+>>> mail from:<c@???>
??? 250
<<< 250 OK
>>> rcpt to:<CALLER@???>
