From 470d71999de29a2fb955727fd82d734772f98570 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Tue, 8 Nov 2016 22:56:13 +0000 Subject: [PATCH] Testsuite: 2091,5403 independent of calling user --- test/log/2091 | 6 +++--- test/scripts/2000-GnuTLS/2091 | 2 +- test/scripts/5400-cutthrough/5403 | 2 +- test/stderr/5403 | 6 +++--- test/stdout/5403 | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/test/log/2091 b/test/log/2091 index c1ae955a8..78638261b 100644 --- a/test/log/2091 +++ b/test/log/2091 @@ -1,7 +1,7 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@testhost.test.ex U=CALLER P=local S=sss for CALLER@test.ex -1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no K C="250- 360 byte chunk, total 360\\n250 OK id=10HmaY-0005vi-00" +1999-03-02 09:44:33 10HmaX-0005vi-00 <= this-user@testhost.test.ex U=this-user P=local S=sss for other-user@test.ex +1999-03-02 09:44:33 10HmaX-0005vi-00 => other-user@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no K C="250- 351 byte chunk, total 351\\n250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed ******** SERVER ******** 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1224 -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> H=localhost (testhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no K S=sss id=E10HmaX-0005vi-00@testhost.test.ex for CALLER@test.ex +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> H=localhost (testhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no K S=sss id=E10HmaX-0005vi-00@testhost.test.ex for other-user@test.ex diff --git a/test/scripts/2000-GnuTLS/2091 b/test/scripts/2000-GnuTLS/2091 index d20f8076c..58e5163c5 100644 --- a/test/scripts/2000-GnuTLS/2091 +++ b/test/scripts/2000-GnuTLS/2091 @@ -2,7 +2,7 @@ gnutls exim -DSERVER=server -DSRV=tls -bd -oX PORT_S **** -exim -odf CALLER@test.ex +exim -oMt this-user -f this-user -odf other-user@test.ex Test message. Contains FF: ΓΏ **** killdaemon diff --git a/test/scripts/5400-cutthrough/5403 b/test/scripts/5400-cutthrough/5403 index 3e6f3189e..ad1b44646 100644 --- a/test/scripts/5400-cutthrough/5403 +++ b/test/scripts/5400-cutthrough/5403 @@ -31,7 +31,7 @@ QUIT **** exim -bhc 1.2.3.4 EHLO myhost.test.ex -MAIL FROM: +MAIL FROM: RCPT TO: DATA diff --git a/test/stderr/5403 b/test/stderr/5403 index dfb5a97e4..065db11d8 100644 --- a/test/stderr/5403 +++ b/test/stderr/5403 @@ -76,8 +76,8 @@ MUNGED: ::1 will be omitted in what follows >>> cmd buf flush 21 bytes >>> SMTP<< 250 OK >>> 127.0.0.1 in hosts_require_auth? no (option unset) ->>> SMTP>> MAIL FROM: ->>> cmd buf flush 37 bytes +>>> SMTP>> MAIL FROM: +>>> cmd buf flush 35 bytes >>> SMTP<< 250 OK >>> SMTP>> RCPT TO: >>> cmd buf flush 29 bytes @@ -91,4 +91,4 @@ MUNGED: ::1 will be omitted in what follows >>> SMTP>> QUIT >>> SMTP(close)>> >>> ----------- cutthrough shutdown (host-checking mode) ------------ -LOG: 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=(myhost.test.ex) [1.2.3.4] P=esmtp S=sss for verify@domain.com +LOG: 10HmaY-0005vi-00 <= sender@myhost.test.ex H=(myhost.test.ex) [1.2.3.4] P=esmtp S=sss for verify@domain.com diff --git a/test/stdout/5403 b/test/stdout/5403 index c0548bae7..f9bcde823 100644 --- a/test/stdout/5403 +++ b/test/stdout/5403 @@ -45,7 +45,7 @@ Connection request from [ip4.ip4.ip4.ip4] 220 server ready EHLO myhost.test.ex 250 OK -MAIL FROM: +MAIL FROM: 250 OK RCPT TO: 250 OK -- 2.30.2