[Test] Fix tests relying on the broken behaviour

diff --git a/lualib/rspamadm/mime.lua b/lualib/rspamadm/mime.lua
index 6765c9e43feae36dd28ce96155a8f4ab9cd0d739..2e0c0c4bfb2e4bcd6b858e08c52c23540ec034e4 100644 (file)
--- a/lualib/rspamadm/mime.lua
+++ b/lualib/rspamadm/mime.lua
@@ -765,7 +765,7 @@ local function modify_handler(opts)
     end
 
     -- End of headers
-    local eoh_pos = #out
+    --local eoh_pos = #out
     out[#out + 1] = ''
 
     local boundaries = {}

diff --git a/test/functional/cases/102_multimap.robot b/test/functional/cases/102_multimap.robot
index 3b0995d56b71d37bf75795f13014e6f9a6193852..5c0dce7816541b3bf062cbeb5e8da0136f0c0cfa 100644 (file)
--- a/test/functional/cases/102_multimap.robot
+++ b/test/functional/cases/102_multimap.robot
@@ -280,11 +280,12 @@ MAP - RECEIVED - IP MINMAX POS - ONE
   Check Rspamc  ${result}  RCVD_TEST_01
   Check Rspamc  ${result}  RCVD_TEST_02  inverse=1
 
-MAP - RECEIVED - IP MINMAX POS - TWO / RCVD_AUTHED_ONE HIT
-  ${result} =  Scan Message With Rspamc  ${RCVD2}
-  Check Rspamc  ${result}  RCVD_TEST_02
-  Should Not Contain  ${result.stdout}  RCVD_TEST_01
-  Should Contain  ${result.stdout}  RCVD_AUTHED_ONE
+# Relies on parsing of shitty received
+#MAP - RECEIVED - IP MINMAX POS - TWO / RCVD_AUTHED_ONE HIT
+#  ${result} =  Scan Message With Rspamc  ${RCVD2}
+#  Check Rspamc  ${result}  RCVD_TEST_02
+#  Should Not Contain  ${result.stdout}  RCVD_TEST_01
+#  Should Contain  ${result.stdout}  RCVD_AUTHED_ONE
 
 MAP - RECEIVED - REDIS
   Redis HSET  RCVD_TEST  2a01:7c8:aab6:26d:5054:ff:fed1:1da2  ${EMPTY}

diff --git a/test/functional/configs/multimap.conf b/test/functional/configs/multimap.conf
index 61bd310a8a3cdaf437d7b2ee2fe0f98aee1598dc..77326f26c0e9d29b94feab7486dea2a030a43c97 100644 (file)
--- a/test/functional/configs/multimap.conf
+++ b/test/functional/configs/multimap.conf
@@ -139,7 +139,7 @@ multimap {
   }
   RCVD_TEST_02 {
     type = "received";
-    min_pos = -2;
+    min_pos = -1;
     map = "${TESTDIR}/configs/maps/rcvd.list";
   }
   RCVD_TEST_REDIS_01 {