tests: Grouped SMTP SASL EXTERNAL tests with other SMTP tests

diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc
index 32df87e3ab78e4cc0f5b1865baf0036e21062901..e9244820910bf0bee86b597e177609e6fe31435f 100644 (file)
--- a/tests/data/Makefile.inc
+++ b/tests/data/Makefile.inc
@@ -98,8 +98,8 @@ test900 test901 test902 test903 test904 test905 test906 test907 test908 \
 test909 test910 test911 test912 test913 test914 test915 test916 test917 \
 test918 test919 test920 test921 test922 test923 test924 test925 test926 \
 test927 test928 test929 test930 test931 test932 test933 test934 test935 \
-test936 test937 test938 test939 test940 test941                         \
-                                        test950 test951 test952 test953 \
+test936 test937 test938 test939 test940 test941 test942 test943 test944 \
+test945 \
 \
 test1000 test1001 test1002 test1003 test1004 test1005 test1006 test1007 \
 test1008 test1009 test1010 test1011 test1012 test1013 test1014 test1015 \

diff --git a/tests/data/test950 b/tests/data/test942
similarity index 89%
rename from tests/data/test950
rename to tests/data/test942
index b4dab8ae8b124057518043baed934004584cb8e9..26740f7b67ddd6e5eca395d06d24099d07abe96e 100644 (file)
--- a/tests/data/test950
+++ b/tests/data/test942
@@ -32,7 +32,7 @@ SMTP external authentication
 mail body\r
 </stdin>
  <command>
-'smtp://user;AUTH=EXTERNAL@%HOSTIP:%SMTPPORT/950' --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
+'smtp://user;AUTH=EXTERNAL@%HOSTIP:%SMTPPORT/942' --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -40,7 +40,7 @@ mail body
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 950\r
+EHLO 942\r
 AUTH EXTERNAL\r
 dXNlcg==\r
 MAIL FROM:<sender@example.com>\r

diff --git a/tests/data/test951 b/tests/data/test943
similarity index 89%
rename from tests/data/test951
rename to tests/data/test943
index 1dd21a6795a7f2f37f14bf266b89b2c2fb5e17a0..aef2c6228550fcb84ed27f93b915fcafa175c5e2 100644 (file)
--- a/tests/data/test951
+++ b/tests/data/test943
@@ -32,7 +32,7 @@ SMTP external authentication without credentials
 mail body\r
 </stdin>
  <command>
-'smtp://;AUTH=EXTERNAL@%HOSTIP:%SMTPPORT/951' --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
+'smtp://;AUTH=EXTERNAL@%HOSTIP:%SMTPPORT/943' --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -40,7 +40,7 @@ mail body
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 951\r
+EHLO 943\r
 AUTH EXTERNAL\r
 =\r
 MAIL FROM:<sender@example.com>\r

diff --git a/tests/data/test952 b/tests/data/test944
similarity index 89%
rename from tests/data/test952
rename to tests/data/test944
index 8537afd12160b1d34a13d8eb90038c4e08a4208f..4b60f120fb3877a640e234b8e4ddde50821bac8c 100644 (file)
--- a/tests/data/test952
+++ b/tests/data/test944
@@ -32,7 +32,7 @@ SMTP external authentication with initial response
 mail body\r
 </stdin>
  <command>
-'smtp://user;AUTH=EXTERNAL@%HOSTIP:%SMTPPORT/952' --mail-rcpt recipient@example.com --mail-from sender@example.com --sasl-ir -T -
+'smtp://user;AUTH=EXTERNAL@%HOSTIP:%SMTPPORT/944' --mail-rcpt recipient@example.com --mail-from sender@example.com --sasl-ir -T -
 </command>
 </client>
 
@@ -40,7 +40,7 @@ mail body
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 952\r
+EHLO 944\r
 AUTH EXTERNAL dXNlcg==\r
 MAIL FROM:<sender@example.com>\r
 RCPT TO:<recipient@example.com>\r

diff --git a/tests/data/test953 b/tests/data/test945
similarity index 89%
rename from tests/data/test953
rename to tests/data/test945
index 94db3aaae5eff38a535794ae343fc16a4ef0400f..3526408d35d65ca1ba4c8fa8d1d61a43be42861e 100644 (file)
--- a/tests/data/test953
+++ b/tests/data/test945
@@ -32,7 +32,7 @@ SMTP external authentication with initial response without credentials
 mail body\r
 </stdin>
  <command>
-'smtp://;AUTH=EXTERNAL@%HOSTIP:%SMTPPORT/953' --mail-rcpt recipient@example.com --mail-from sender@example.com --sasl-ir -T -
+'smtp://;AUTH=EXTERNAL@%HOSTIP:%SMTPPORT/945' --mail-rcpt recipient@example.com --mail-from sender@example.com --sasl-ir -T -
 </command>
 </client>
 
@@ -40,7 +40,7 @@ mail body
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 953\r
+EHLO 945\r
 AUTH EXTERNAL =\r
 MAIL FROM:<sender@example.com>\r
 RCPT TO:<recipient@example.com>\r