Testsuite: more tidying for Alpine

diff --git a/test/dnszones-src/db.test.ex._bad b/test/dnszones-src/db.test.ex._bad
new file mode 100644 (file)
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 dfcfc1b67ab004706cbc6c6c5889fc9cb245ba1b..d66cc0029478c2b2c35f2a5461f84e0d2976825f 100644 (file)
--- 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@test.ex 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@test.ex 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"@test.ex 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@test.ex 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@test.ex 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@test.ex 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@test.ex 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 951caaf1ae2e3e42fa9b2abed61f38841f453094..ff99c1b67eada12d8465af35e8ad4b8f64051092 100644 (file)
--- 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@test.ex 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@test.ex 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"@test.ex 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@test.ex 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@test.ex 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@test.ex 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@test.ex 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 9ca82395f6fc427654c35a1fbc65820f5440aa42..4f381035621327dbd960bc1c5485af7cd5cb00f6 100644 (file)
--- a/test/mail/2102.CALLER
+++ b/test/mail/2102.CALLER
@@ -1,8 +1,8 @@
-From CALLER@test.ex Tue Mar 02 09:44:33 1999
+From a@test.ex 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@test.ex>)
+       (envelope-from <a@test.ex>)
        id 10HmaX-0005vi-00
        for CALLER@test.ex; 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@test.ex Tue Mar 02 09:44:33 1999
+From b@test.ex 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@test.ex>)
+       (envelope-from <b@test.ex>)
        id 10HmaZ-0005vi-00
        for CALLER@test.ex; 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@test.ex Tue Mar 02 09:44:33 1999
+From c@test.ex 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@test.ex>)
+       (envelope-from <c@test.ex>)
        id 10HmbA-0005vi-00
        for CALLER@test.ex; 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 0333aa3f3f62b12a0f7f904492af7eb64afdd75a..0e336e7b1536fc66e195efda0890a063334cbd06 100644 (file)
--- a/test/scripts/0000-Basic/0078
+++ b/test/scripts/0000-Basic/0078
@@ -7,4 +7,4 @@ exim -d-all+route -bt myhost.test.ex@mxt1.test.ex
 exim -d-all+route -bt xx@mxt1.test.ex
 ****
 2
-exim -d-all+route -bt xx@not.exist
+exim -d-all+route -bt xx@not-exist.test.ex

diff --git a/test/scripts/0000-Basic/0161 b/test/scripts/0000-Basic/0161
index 0d453ea25749c3d2f1ab85222fdd03af422390f1..7908c347a6b1f25fb05bdb271e29a936b70bc8bb 100644 (file)
--- a/test/scripts/0000-Basic/0161
+++ b/test/scripts/0000-Basic/0161
@@ -8,7 +8,7 @@ exim -d-all+route -bt myhost.test.ex@mxt1.test.ex
 exim -d-all+route -bt xx@mxt1.test.ex
 ****
 2
-exim -d-all+route -bt xx@not.exist
+exim -d-all+route -bt xx@not-exist.test.ex
 ****
 2
 exim -d-all+route -bt ff@mxt1.test.ex

diff --git a/test/scripts/0000-Basic/0557 b/test/scripts/0000-Basic/0557
index 02ab466d2fcb25dc695a59cba9a7aa6c9a1eab3c..ffb85bc9dd697d9de0bc988337202109382e7a07 100644 (file)
--- a/test/scripts/0000-Basic/0557
+++ b/test/scripts/0000-Basic/0557
@@ -3,26 +3,26 @@
 exim -DFAKE=# -DOPT=# -bt userx@test.ex
 ****
 1
-exim -DOPT=# -DHOSTS=a.non.exist -bt userx@test.ex
+exim -DOPT=# -DHOSTS=a.non-exist.test.ex -bt userx@test.ex
 ****
 1
-exim -DOPT=# -DHOSTS=a.non.exist:b.non.exist -bt userx@test.ex
+exim -DOPT=# -DHOSTS=a.non-exist.test.ex:b.non-exist.test.ex -bt userx@test.ex
 ****
-exim -DOPT=# -DHOSTS=a.non.exist:127.0.0.1 -bt userx@test.ex
+exim -DOPT=# -DHOSTS=a.non-exist.test.ex:127.0.0.1 -bt userx@test.ex
 ****
-exim -DOPT=# -DHOSTS=127.0.0.1:b.non.exist:127.0.0.2 -bt userx@test.ex
+exim -DOPT=# -DHOSTS=127.0.0.1:b.non-exist.test.ex:127.0.0.2 -bt userx@test.ex
 ****
 1
-exim -DHOSTS=a.non.exist -DHAI=defer -bt userx@test.ex
+exim -DHOSTS=a.non-exist.test.ex -DHAI=defer -bt userx@test.ex
 ****
 2
-exim -DHOSTS=a.non.exist -DHAI=decline -bt userx@test.ex
+exim -DHOSTS=a.non-exist.test.ex -DHAI=decline -bt userx@test.ex
 ****
 2
-exim -DHOSTS=a.non.exist -DHAI=fail -bt userx@test.ex
+exim -DHOSTS=a.non-exist.test.ex -DHAI=fail -bt userx@test.ex
 ****
-exim -DHOSTS=a.non.exist -DHAI=pass -bt userx@test.ex
+exim -DHOSTS=a.non-exist.test.ex -DHAI=pass -bt userx@test.ex
 ****
 1
-exim -DHOSTS=a.non.exist -DHAI=freeze -bt userx@test.ex
+exim -DHOSTS=a.non-exist.test.ex -DHAI=freeze -bt userx@test.ex
 ****

diff --git a/test/scripts/2100-OpenSSL/2102 b/test/scripts/2100-OpenSSL/2102
index ade51944c000cbedc0bc5f2dfa41310d0c05f979..9a9f4d7bd2d071211ebb7b09e14b9578c952e125 100644 (file)
--- 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@test.ex>
+mail from:<a@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>
 ??? 250
@@ -84,7 +84,7 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
-mail from:<CALLER@test.ex>
+mail from:<b@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>
 ??? 250
@@ -115,7 +115,7 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
-mail from:<CALLER@test.ex>
+mail from:<c@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>
 ??? 250

diff --git a/test/stderr/0078 b/test/stderr/0078
index 5f08f68d8f4bcd8f8b46dd8461ab413146c7f63c..ff218e3c62eacd2670e234c954af235805504e5d 100644 (file)
--- 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@not.exist
+routing xx@not-exist.test.ex
 --------> 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@not.exist
-  domain = not.exist
-lookuphost router declined for xx@not.exist
+lookuphost router called for xx@not-exist.test.ex
+  domain = not-exist.test.ex
+lookuphost router declined for xx@not-exist.test.ex
 "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 9ace15fd1edfa193dc8c505def5980000bf298f1..53317177bcaa1a95fb6fd4951fd6b7ce46ef8b93 100644 (file)
--- 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@not.exist
+routing xx@not-exist.test.ex
 --------> 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@not.exist
-  domain = not.exist
-lookuphost router declined for xx@not.exist
+lookuphost router called for xx@not-exist.test.ex
+  domain = not-exist.test.ex
+lookuphost router declined for xx@not-exist.test.ex
 "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 483feff2e3af26dc79b21f95847755c9e87864c6..d831fde6bd6fdc01215946f5c644be3f20217230 100644 (file)
--- a/test/stdout/0078
+++ b/test/stdout/0078
@@ -7,4 +7,4 @@ myhost.test.ex@mxt1.test.ex
 xx@mxt1.test.ex
   router = self2, transport = remote_smtp
   host myhost.test.ex [V4NET.10.10.10]
-xx@not.exist is undeliverable: Unrouteable address
+xx@not-exist.test.ex is undeliverable: Unrouteable address

diff --git a/test/stdout/0161 b/test/stdout/0161
index b8332fe4452bd2f6f86cdc1d7a07967fd924e3ca..41536257b34fc085a6db65d7b013dca910e61cbe 100644 (file)
--- a/test/stdout/0161
+++ b/test/stdout/0161
@@ -7,6 +7,6 @@ myhost.test.ex@mxt1.test.ex
 xx@mxt1.test.ex
   router = self2, transport = remote_smtp
   host myhost.test.ex [V4NET.10.10.10]
-xx@not.exist is undeliverable: Unrouteable address
+xx@not-exist.test.ex is undeliverable: Unrouteable address
 ff@mxt1.test.ex is undeliverable: lowest numbered MX record points to local host
 fff@mxt1.test.ex is undeliverable: lookup of host "fff" failed in fail router

diff --git a/test/stdout/2102 b/test/stdout/2102
index d6a9ab414c7f16e98b9dbbb7314a7bb6392f71bf..ecd88c6e3cb59f65609ea7907a84afbddc8727f0 100644 (file)
--- 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@test.ex>
+>>> mail from:<a@test.ex>
 ??? 250
 <<< 250 OK
 >>> rcpt to:<CALLER@test.ex>
@@ -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@test.ex>
+>>> mail from:<b@test.ex>
 ??? 250
 <<< 250 OK
 >>> rcpt to:<CALLER@test.ex>
@@ -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@test.ex>
+>>> mail from:<c@test.ex>
 ??? 250
 <<< 250 OK
 >>> rcpt to:<CALLER@test.ex>