From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Wed, 30 Sep 2020 15:37:39 +0000 (+0100)
Subject: [Test] Add tests for multimap combined scores
X-Git-Tag: 2.6~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90c781f9c67b9162853d256e5e615d7196ea09b4;p=thirdparty%2Frspamd.git

[Test] Add tests for multimap combined scores
---

diff --git a/test/functional/cases/102_multimap.robot b/test/functional/cases/102_multimap.robot
index 09bc9e205e..701714264b 100644
--- a/test/functional/cases/102_multimap.robot
+++ b/test/functional/cases/102_multimap.robot
@@ -67,7 +67,7 @@ MAP - FROM
 
 MAP - COMBINED IP MASK FROM
   Scan File  ${MESSAGE}  IP=10.1.0.10  From=user@example.com
-  Expect Symbol  COMBINED_MAP_AND
+  Expect Symbol With Score  COMBINED_MAP_AND  10
   Expect Symbol  COMBINED_MAP_OR
 
 MAP - COMBINED IP MASK ONLY
diff --git a/test/functional/configs/multimap.conf b/test/functional/configs/multimap.conf
index 36f2514e70..d4fad0e16d 100644
--- a/test/functional/configs/multimap.conf
+++ b/test/functional/configs/multimap.conf
@@ -179,7 +179,9 @@ multimap {
         selector = "from:domain";
       }
     }
-    expression = "from & ip"
+    expression = "from & ip";
+    score = 10;
+    prefilter = true;
   }
   COMBINED_MAP_OR {
     type = "combined";