Change feed00.tst to be a very simple email process

diff --git a/Makefile b/Makefile
index be040c2ea4f34a599058e00c7c6091bea772da7e..b70b4540a46e23196e3efc4bdfd721cbf2e65add 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,6 @@ sorter        :  clean debug
                data-$@/*                               \
                $(TESTDIR)/var/spool/$(APPNAME)/queue
           @ bin/sorter                                 \
-                  -f                                   \
                   -d 2                                 \
                   -c ./conf/mailleur.conf.dvl          \
                   -r $(TESTDIR) 
@@ -134,7 +133,7 @@ onefeed     :  debug
                        -c ./conf/feeder.conf.dvl       \
                        $(TESTIP)                       \
                        $(TESTPORT)                     \
-                       ./$(DATATST)/xxfeed.tst
+                       ./$(DATATST)/feed00.tst
           @ rm -fr ./data-sorter/*
           @ cp -a                                      \
                $(TESTDIR)/var/spool/$(APPNAME)/queue/* \

diff --git a/data-feed/feed00.tst b/data-feed/feed00.tst
index eb22d71d0bacaa6c2ec081d99c2381107a965a1c..d809322d1ad97d8a7e29c6c177f104fadd638f31 100644 (file)
--- a/data-feed/feed00.tst
+++ b/data-feed/feed00.tst
@@ -1,9 +1,4 @@
-#basic test to feed SMTP server
 #====================================================
-# Test language available
-# # comment
-# C: command to execute
-#      GOTLS           - Going in TLS mode
 #      WAIT X          - Stop for X seconds
 #      RESTART         - Restart connection with remote
 #      COMMENT START   - START commenting mode
@@ -29,64 +24,39 @@ C:COMMENT START
 #end of /etc/host addon
 #====================================================
 C:COMMENT STOP
-#====================================================
-#starting test 
-T:basic test function
+T:Sending a very Simple Email with local delivery
 R:220 mailleur.example.com ESMTP (cleartext) emlrcvr...
-S:EHLO example.com
-R:250-mailleur.example.com, link (cleartext) ready, your IP/FQDN=[127.0.0.1/localhost.localdomain]
-R:250-SIZE 52428800
-R:250-STARTTLS
-R:250-8BITMIME
-R:250-ENHANCEDSTATUSCODES
-R:250-AUTH PLAIN LOGIN
-R:250 HELP
+#====================================================
+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...
-S:EHLO example.com
-#R:250-mailleur.example.com, link (crypted) ready, your IP/FQDN=[127.0.0.1/localhost.localdomain]
-R:250-mailleur.example.com, link (crypted) ready, your IP/FQDN...
-R:250-SIZE 52428800
-R:250-8BITMIME
-R:250-ENHANCEDSTATUSCODES
-R:250-AUTH PLAIN LOGIN
-R:250 HELP
-#send a empty ehlo
-S:EHLO
-R:501 5.5.4 syntax error (domain part missing), closing connection.
-R:Disconnected
-#-------------------------------------------------------------------------
-#prepare next test
-#waiting 1 sec
-C:WAIT 1
-#-restarting link
-C:RESTART
-R:220 mailleur.example.com ESMTP (cleartext) emlrcvr...
-C:ORGN 127.168.0.1
-R:220 mailleur.example.com ESMTP (cleartext) emlrcvr...
-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: <postmaster@example.com>
 R:250 2.1.3 postmaster@example.com.. sender ok
-S:RCPT TO: <postmaster@example.com>
+S:RCPT TO: <webmaster@example.com>
 R:250 2.6.4 Address accepted
 S:RCPT TO: <postmaster@example.com>
-R:250 2.6.4 duplicate recipients will be consolidated
-S:RCPT TO: <webmaster@example.com>
 R:250 2.6.4 Address accepted
-S:RCPT TO: 
-R:501 5.6.0 <> recipient not specified
-S:RCPT TO: <onlylocal>
-R:553 5.6.2 Missing domain part
-S:RCPT TO: <local:test@example.com>
-R:553 5.6.2 ':' not allowed in email
 #-------------------------------------------------------------------------
+#-sending data
+C:DATA
+D:Subject: Very Simple email contents
+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|
+C:.
+#-------------------------------------------------------------------------
+R:250 3.5.3 Message accepted for delivery
 S:QUIT
 R:221 2.0.0 Bye, closing connection...
+#-------------------------------------------------------------------------

diff --git a/data-feed/feed03.tst b/data-feed/feed03.tst
new file mode 100644 (file)
index 0000000..36b072b
--- /dev/null
+++ b/data-feed/feed03.tst
@@ -0,0 +1,64 @@
+#basic test to feed SMTP server
+#====================================================
+# Test language available
+# # comment
+# C: command to execute
+#      GOTLS           - Going in TLS mode
+#      WAIT X          - Stop for X seconds
+#      RESTART         - Restart connection with remote
+#      COMMENT START   - START commenting mode
+#      COMMENT STOP    - STOP commenting mode
+# R: incoming data
+# S: outgoing data
+# T: Test titre or Info
+C:COMMENT START
+#====================================================
+#Please update /etc/hosts with with following
+#start of /etc/host addon
+#----------------------------------------------------
+#Definition to validate mailleur daemon (emlrcvr) server
+#The test serveur itself
+127.127.10.25                   mailleur.example.com    mailleur
+#The example.com email feeder
+127.127.0.1                    feed1.example.com       feed1
+127.127.0.2                    feed2.example.com       feed2
+#remote access
+#127.168.0.1                    no reverss address detection
+127.168.10.1                    foreign1.badserver.tld  foreign1
+#----------------------------------------------------
+#end of /etc/host addon
+#====================================================
+C:COMMENT STOP
+#====================================================
+#starting test 
+T:basic test function
+R:220 mailleur.example.com ESMTP (cleartext) emlrcvr...
+S:EHLO example.com
+R:250-mailleur.example.com, link (cleartext) ready, your IP/FQDN=[127.0.0.1/localhost.localdomain]
+R:250-SIZE 52428800
+R:250-STARTTLS
+R:250-8BITMIME
+R:250-ENHANCEDSTATUSCODES
+R:250-AUTH PLAIN LOGIN
+R:250 HELP
+C:GOTLS
+R:250 Link now encryp...
+S:EHLO example.com
+#R:250-mailleur.example.com, link (crypted) ready, your IP/FQDN=[127.0.0.1/localhost.localdomain]
+R:250-mailleur.example.com, link (crypted) ready, your IP/FQDN...
+R:250-SIZE 52428800
+R:250-8BITMIME
+R:250-ENHANCEDSTATUSCODES
+R:250-AUTH PLAIN LOGIN
+R:250 HELP
+#send a empty ehlo
+S:EHLO
+R:501 5.5.4 syntax error (domain part missing), closing connection.
+R:Disconnected
+#-------------------------------------------------------------------------
+#prepare next test
+#waiting 1 sec
+C:WAIT 1
+#-restarting link
+C:RESTART
+R:220 mailleur.example.com ESMTP (cleartext) emlrcvr...