git://git.exim.org
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e0fccd1
)
Fix test 5400 when not run under a user named eximtest.
author
Tony Finch
<dot@dotat.at>
Fri, 7 Dec 2012 15:45:00 +0000
(15:45 +0000)
committer
Tony Finch
<dot@dotat.at>
Fri, 7 Dec 2012 15:45:00 +0000
(15:45 +0000)
test/stderr/5400
patch
|
blob
|
history
test/stdout/5400
patch
|
blob
|
history
diff --git
a/test/stderr/5400
b/test/stderr/5400
index bc3dba5ddb738dc21f95e852c4424dcdefd587ed..78b56539acac6293d9c2afa18794a5f9fa7a1dbb 100644
(file)
--- a/
test/stderr/5400
+++ b/
test/stderr/5400
@@
-17,7
+17,7
@@
Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected
SMTP<< 220 ESMTP
SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
SMTP<< 220 ESMTP
SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
- SMTP>> MAIL FROM:<
CALLER
@myhost.test.ex>
+ SMTP>> MAIL FROM:<
eximtest
@myhost.test.ex>
SMTP<< 250 Sender OK
SMTP>> RCPT TO:<userx@domain.com>
SMTP<< 250 Recipient OK
SMTP<< 250 Sender OK
SMTP>> RCPT TO:<userx@domain.com>
SMTP<< 250 Recipient OK
@@
-60,7
+60,7
@@
Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected
SMTP<< 550 Not here, mate
SMTP>> HELO myhost.test.ex
SMTP<< 250 OK
SMTP<< 550 Not here, mate
SMTP>> HELO myhost.test.ex
SMTP<< 250 OK
- SMTP>> MAIL FROM:<
CALLER
@myhost.test.ex>
+ SMTP>> MAIL FROM:<
eximtest
@myhost.test.ex>
SMTP<< 250 Sender OK
SMTP>> RCPT TO:<userz@domain.com>
SMTP<< 250 Recipient OK
SMTP<< 250 Sender OK
SMTP>> RCPT TO:<userz@domain.com>
SMTP<< 250 Recipient OK
@@
-101,7
+101,7
@@
Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected
SMTP<< 220 ESMTP
SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
SMTP<< 220 ESMTP
SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
- SMTP>> MAIL FROM:<
CALLER
@myhost.test.ex>
+ SMTP>> MAIL FROM:<
eximtest
@myhost.test.ex>
SMTP<< 250 Sender OK
SMTP>> RCPT TO:<usery@domain.com>
SMTP<< 250 Recipient OK
SMTP<< 250 Sender OK
SMTP>> RCPT TO:<usery@domain.com>
SMTP<< 250 Recipient OK
diff --git
a/test/stdout/5400
b/test/stdout/5400
index 74c2d235880815c38e94028bea36595666a30e22..f06824a703be24c8f976ada0b235e494680b750e 100644
(file)
--- a/
test/stdout/5400
+++ b/
test/stdout/5400
@@
-39,7
+39,7
@@
Connection request from [ip4.ip4.ip4.ip4]
220 ESMTP
EHLO myhost.test.ex
250 OK
220 ESMTP
EHLO myhost.test.ex
250 OK
-MAIL FROM:<
CALLER
@myhost.test.ex>
+MAIL FROM:<
eximtest
@myhost.test.ex>
250 Sender OK
RCPT TO:<userx@domain.com>
250 Recipient OK
250 Sender OK
RCPT TO:<userx@domain.com>
250 Recipient OK
@@
-66,7
+66,7
@@
EHLO myhost.test.ex
550 Not here, mate
HELO myhost.test.ex
250 OK
550 Not here, mate
HELO myhost.test.ex
250 OK
-MAIL FROM:<
CALLER
@myhost.test.ex>
+MAIL FROM:<
eximtest
@myhost.test.ex>
250 Sender OK
RCPT TO:<userz@domain.com>
250 Recipient OK
250 Sender OK
RCPT TO:<userz@domain.com>
250 Recipient OK
@@
-91,7
+91,7
@@
Connection request from [ip4.ip4.ip4.ip4]
220 ESMTP
EHLO myhost.test.ex
250 OK
220 ESMTP
EHLO myhost.test.ex
250 OK
-MAIL FROM:<
CALLER
@myhost.test.ex>
+MAIL FROM:<
eximtest
@myhost.test.ex>
250 Sender OK
RCPT TO:<usery@domain.com>
250 Recipient OK
250 Sender OK
RCPT TO:<usery@domain.com>
250 Recipient OK