tests: Grouped IMAP SASL EXTERNAL tests with other IMAP tests

diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc
index 3101da69fee4ce83ba697a17368d5db68307a690..0441ffce6aee2218d339647956c8e78449f67d84 100644 (file)
--- a/tests/data/Makefile.inc
+++ b/tests/data/Makefile.inc
@@ -86,7 +86,7 @@ test800 test801 test802 test803 test804 test805 test806 test807 test808 \
 test809 test810 test811 test812 test813 test814 test815 test816 test817 \
 test818 test819 test820 test821 test822 test823 test824 test825 test826 \
 test827 test828 test829 test830 test831 test832 test833 test834 test835 \
-test836 \
+test836 test837 test838 test839 test840 \
 \
 test850 test851 test852 test853 test854 test855 test856 test857 test858 \
 test859 test860 test861 test862 test863 test864 test865 test866 test867 \
@@ -97,8 +97,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 test942 test943 test944 \
-test945 test946 test947 test948 test949 test950 test951 test952 test953 \
+test936 test937 test938 test939 test940 test941                         \
+        test946 test947 test948 test949 test950 test951 test952 test953 \
 \
 test1000 test1001 test1002 test1003 test1004 test1005 test1006 test1007 \
 test1008 test1009 test1010 test1011 test1012 test1013 test1014 test1015 \

diff --git a/tests/data/test942 b/tests/data/test837
similarity index 87%
rename from tests/data/test942
rename to tests/data/test837
index fb4cfbfb3aa9dd4b3a206aa111df19bdec96b81e..d5974634e62505616c328d0d6dcc569118d54797 100644 (file)
--- a/tests/data/test942
+++ b/tests/data/test837
@@ -37,7 +37,7 @@ imap
 IMAP external authentication
  </name>
  <command>
-'imap://user;AUTH=EXTERNAL@%HOSTIP:%IMAPPORT/942/;UID=1'
+'imap://user;AUTH=EXTERNAL@%HOSTIP:%IMAPPORT/837/;UID=1'
 </command>
 </client>
 
@@ -48,7 +48,7 @@ IMAP external authentication
 A001 CAPABILITY\r
 A002 AUTHENTICATE EXTERNAL\r
 dXNlcg==\r
-A003 SELECT 942\r
+A003 SELECT 837\r
 A004 FETCH 1 BODY[]\r
 A005 LOGOUT\r
 </protocol>

diff --git a/tests/data/test943 b/tests/data/test838
similarity index 88%
rename from tests/data/test943
rename to tests/data/test838
index 833a92b83f59277e48167a701c0c4d6b7c273d31..da2d28d050160fa9c7437d2026736608ef031fbc 100644 (file)
--- a/tests/data/test943
+++ b/tests/data/test838
@@ -37,7 +37,7 @@ imap
 IMAP external authentication without credentials
  </name>
  <command>
-'imap://;AUTH=EXTERNAL@%HOSTIP:%IMAPPORT/943/;UID=1'
+'imap://;AUTH=EXTERNAL@%HOSTIP:%IMAPPORT/838/;UID=1'
 </command>
 </client>
 
@@ -48,7 +48,7 @@ IMAP external authentication without credentials
 A001 CAPABILITY\r
 A002 AUTHENTICATE EXTERNAL\r
 =\r
-A003 SELECT 943\r
+A003 SELECT 838\r
 A004 FETCH 1 BODY[]\r
 A005 LOGOUT\r
 </protocol>

diff --git a/tests/data/test944 b/tests/data/test839
similarity index 88%
rename from tests/data/test944
rename to tests/data/test839
index 3328953c2398e16e43bd6a1f1afdcbf7f2da48b4..2a544c1cfcf826188a167600226f6c1dce94ade0 100644 (file)
--- a/tests/data/test944
+++ b/tests/data/test839
@@ -38,7 +38,7 @@ imap
 IMAP external authentication with initial response
  </name>
  <command>
-'imap://user;AUTH=EXTERNAL@%HOSTIP:%IMAPPORT/944/;UID=1'
+'imap://user;AUTH=EXTERNAL@%HOSTIP:%IMAPPORT/839/;UID=1'
 </command>
 </client>
 
@@ -48,7 +48,7 @@ IMAP external authentication with initial response
 <protocol>
 A001 CAPABILITY\r
 A002 AUTHENTICATE EXTERNAL dXNlcg==\r
-A003 SELECT 944\r
+A003 SELECT 839\r
 A004 FETCH 1 BODY[]\r
 A005 LOGOUT\r
 </protocol>

diff --git a/tests/data/test945 b/tests/data/test840
similarity index 89%
rename from tests/data/test945
rename to tests/data/test840
index 158b3579a02fda2d89d27abe3c4076864b8f20cf..eaf1aeea4a1c078175ae5a60aab426e1a83a84b8 100644 (file)
--- a/tests/data/test945
+++ b/tests/data/test840
@@ -38,7 +38,7 @@ imap
 IMAP external authentication with initial response without credentials
  </name>
  <command>
-'imap://;AUTH=EXTERNAL@%HOSTIP:%IMAPPORT/945/;UID=1'
+'imap://;AUTH=EXTERNAL@%HOSTIP:%IMAPPORT/840/;UID=1'
 </command>
 </client>
 
@@ -48,7 +48,7 @@ IMAP external authentication with initial response without credentials
 <protocol>
 A001 CAPABILITY\r
 A002 AUTHENTICATE EXTERNAL =\r
-A003 SELECT 945\r
+A003 SELECT 840\r
 A004 FETCH 1 BODY[]\r
 A005 LOGOUT\r
 </protocol>