tests: Regrouping of SMTP tests

diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 9ffcf75b18efe07464311daac6ea254973d87bf7..d2948ed31e769503797986d4ee94cb871d060ece 100644 (file)
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -69,8 +69,8 @@ test809 test810 test811 test812 test813 test814 \
 test850 test851 test852 test853 test854 test855 test856 test857 test858 \
 test859 test860 test861 test862 \
 \
-test900 test901 test902 test903 test904 test905 test906 test907 test908 \
-test909 test910 test911 test912 test913 test914 \
+test900 test901 test902 test903 test904 test905         test907 test908 \
+test909 test910 test911 test912 test913 test914 test915 \
 \
 test1000 test1001 test1002 test1003 test1004 test1005 test1006 test1007 \
 test1008 test1009 test1010 test1011 test1012 test1013 test1014 test1015 \

diff --git a/tests/data/test906 b/tests/data/test906
deleted file mode 100644 (file)
index a12b2eb..0000000
--- a/tests/data/test906
+++ /dev/null
@@ -1,51 +0,0 @@
-<testcase>
-<info>
-<keywords>
-SMTP
-</keywords>
-</info>
-
-#
-# Server-side
-<reply>
-</reply>
-
-#
-# Client-side
-<client>
-<server>
-smtp
-</server>
- <name>
-SMTP without --mail-from
- </name>
-<stdin>
-From: different\r
-To: another\r
-\r
-body\r
-</stdin>
- <command>
-smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 906@example.com -T -
-</command>
-</client>
-
-#
-# Verify data after the test has been "shot"
-<verify>
-<protocol>
-EHLO user\r
-MAIL FROM:<>\r
-RCPT TO:<906@example.com>\r
-DATA\r
-QUIT\r
-</protocol>
-<upload>
-From: different\r
-To: another\r
-\r
-body\r
-.\r
-</upload>
-</verify>
-</testcase>

diff --git a/tests/data/test915 b/tests/data/test915
new file mode 100644 (file)
index 0000000..a12b2eb
--- /dev/null
+++ b/tests/data/test915
@@ -0,0 +1,51 @@
+<testcase>
+<info>
+<keywords>
+SMTP
+</keywords>
+</info>
+
+#
+# Server-side
+<reply>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+smtp
+</server>
+ <name>
+SMTP without --mail-from
+ </name>
+<stdin>
+From: different\r
+To: another\r
+\r
+body\r
+</stdin>
+ <command>
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 906@example.com -T -
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+EHLO user\r
+MAIL FROM:<>\r
+RCPT TO:<906@example.com>\r
+DATA\r
+QUIT\r
+</protocol>
+<upload>
+From: different\r
+To: another\r
+\r
+body\r
+.\r
+</upload>
+</verify>
+</testcase>