tests: Grouped SMTP SASL EXTERNAL tests with other SMTP tests

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 \

tests/data/test950 → tests/data/test942

@@ -32,7 +32,7 @@ SMTP external authentication
 mail body
 </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
+EHLO 942
 AUTH EXTERNAL
 dXNlcg==
 MAIL FROM:<sender@example.com>

tests/data/test951 → tests/data/test943

@@ -32,7 +32,7 @@ SMTP external authentication without credentials
 mail body
 </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
+EHLO 943
 AUTH EXTERNAL
 =
 MAIL FROM:<sender@example.com>

tests/data/test952 → tests/data/test944

@@ -32,7 +32,7 @@ SMTP external authentication with initial response
 mail body
 </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
+EHLO 944
 AUTH EXTERNAL dXNlcg==
 MAIL FROM:<sender@example.com>
 RCPT TO:<recipient@example.com>

tests/data/test953 → tests/data/test945

@@ -32,7 +32,7 @@ SMTP external authentication with initial response without credentials
 mail body
 </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
+EHLO 945
 AUTH EXTERNAL =
 MAIL FROM:<sender@example.com>
 RCPT TO:<recipient@example.com>