feed00->feed02 properly handled

diff --git a/Makefile b/Makefile
index efa51d47bedb57df46327b43d052adfa201dd510..5471bcb24fd7e6d8effac9d3d4bca47f82f4a26c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -130,7 +130,7 @@ FEEDPAR     =                                               \
                $(TESTIP)                               \
                $(TESTPORT)                             \
                ./$(DATATST)/feed*.tst
-ONEFEED=feed01.tst
+ONEFEED=feed02.tst
 
 #to test with an external server
 extfeed        :       debug

diff --git a/data-feed/feed02.tst b/data-feed/feed02.tst
index aa3b18816875b442abfa109ac1a97e7bc0cea0c0..013b7f06920904a93f109e0e92d61659770a8532 100644 (file)
--- a/data-feed/feed02.tst
+++ b/data-feed/feed02.tst
@@ -1,17 +1,8 @@
-#very simple  test to feed SMTP server
-C:COMMENT START
-LINE 1
-LINE 2
-C:COMMENT STOP
-#====================================================
-T:Sending a very Simple Email
-R:220 mailleur.example.com ESMTP (cleartext) emlrcvr...
+T:Sending a very Simple Email top 2 domaines
+R:220 mailleur.example.com, ESMTP (cleartext) emlrcvr...
 #====================================================
 S:HELO example.com
-#R:250-mailleur.example.com, link (cleartext) ready, your IP/FQDN=[127.127.0.2/feed2.example.com]
-R:250-mailleur.example.com, link (cleartext) ready,...
-C:GOTLS
-R:250 Link now encryp...
+R:250 mailleur.example.com, link (cleartext) ready,...
 S:MAIL FROM: <postmaster@example.com>
 R:250 2.1.3 postmaster@example.com.. sender ok
 S:RCPT TO: <webmaster@example.com>
@@ -20,89 +11,20 @@ S:RCPT TO: <dom1user1@subdom1.example.com>
 R:250 2.6.4 Address accepted
 S:RCPT TO: <dom2user1@subdom2.example.com>
 R:250 2.6.4 Address accepted
+S:RCPT TO: <dom1user2@subdom1.example.com>
+R:250 2.6.4 Address accepted
 S:RCPT TO: <dom2user2@subdom2.example.com>
 R:250 2.6.4 Address accepted
 #-------------------------------------------------------------------------
 #-sending data
 C:DATA 354 3.5.0 End data with <CR><LF>.<CR><LF>
-D:Subject: Very Simple email contents
+D:Subject: Very Simple email contents 2 domains
 D:From: Maitre Post <postmaster@example.com>
 D:To: Maitre WEB <webmaster@example.com>
 D:
-D:FIRST Line
-D:SECOND Line
-D:LAST Line
-D:.
-D:this is a line with a dot
-D:
-D:.
-D:end
-D:ligne court|
+D:This email is sent to 2 domain X 2 users
 C:.
 #-------------------------------------------------------------------------
-R:250 3.5.3 Message accepted for delivery
+R:250 3.5.3 Message accepted for delivery...
 S:QUIT
 R:221 2.0.0 Bye, closing connection...
-#-------------------------------------------------------------------------
-#prepare next test
-#waiting 1 sec
-C:WAIT 1
-#-restarting link
-C:RESTART
-R:220 mailleur.example.com ESMTP (cleartext) emlrcvr...
-S:MAIL FROM: <webmaster@example.com>
-R:250 2.1.3 webmaster@example.com.. sender ok
-S:RCPT TO: <dom1user1@subdom1.example.com>
-R:250 2.6.4 Address accepted
-S:RCPT TO: <dom1user2@subdom1.example.com>
-R:250 2.6.4 Address accepted
-S:RCPT TO: <dom2user1@subdom2.example.com>
-R:250 2.6.4 Address accepted
-S:RCPT TO: <dom2user2@subdom2.example.com>
-R:250 2.6.4 Address accepted
-S:RCPT TO: <postmaster@example.com>
-R:250 2.6.4 Address accepted
-#-------------------------------------------------------------------------
-#-sending data
-C:DATA 354 3.5.0 End data with <CR><LF>.<CR><LF>
-D:Subject: Second email contents
-D:
-D:SECOND FIRST Line
-D:SECOND SECOND Line
-D:SECOND LAST Line
-D:
-D:
-C:.
-#-------------------------------------------------------------------------
-R:250 3.5.3 Message accepted for delivery
-S:QUIT
-#-------------------------------------------------------------------------
-#prepare next test
-#waiting 1 sec
-C:WAIT 1
-#-restarting link
-C:RESTART
-R:220 mailleur.example.com ESMTP (cleartext) emlrcvr...
-S:MAIL FROM: <noreply@example.com>
-R:250 2.1.3 noreply@example.com.. sender ok
-S:RCPT TO: <dom1user1@subdom1.example.com>
-R:250 2.6.4 Address accepted
-S:RCPT TO: <dom1user2@subdom1.example.com>
-R:250 2.6.4 Address accepted
-S:RCPT TO: <dom2user1@subdom2.example.com>
-R:250 2.6.4 Address accepted
-S:RCPT TO: <dom2user2@subdom2.example.com>
-R:250 2.6.4 Address accepted
-#-------------------------------------------------------------------------
-#-sending data
-C:DATA 354 3.5.0 End data with <CR><LF>.<CR><LF>
-D:Subject: Third email contents
-D:
-D:THIRD FIRST Line
-D:THIRD SECOND Line
-D:THIRD LAST Line
-D:
-C:.
-#-------------------------------------------------------------------------
-R:250 3.5.3 Message accepted for delivery
-S:QUIT