From: Vsevolod Stakhov <vsevolod@rspamd.com>
Date: Mon, 20 May 2024 17:56:38 +0000 (+0100)
Subject: [Test] Properly test symbols registration
X-Git-Tag: 3.9.0~35^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=18d74e11199d876a14b9aa9520871c3d3a96dccc;p=thirdparty%2Frspamd.git

[Test] Properly test symbols registration
---

diff --git a/test/functional/cases/001_merged/102_multimap.robot b/test/functional/cases/001_merged/102_multimap.robot
index 135f5ce34c..8e9d83d42c 100644
--- a/test/functional/cases/001_merged/102_multimap.robot
+++ b/test/functional/cases/001_merged/102_multimap.robot
@@ -420,13 +420,13 @@ MAP - EXTERNAL MISS
 MAP - DYNAMIC SYMBOLS - SYM1
   Scan File  ${MESSAGE}  IP=127.0.0.1  Hostname=foo
   ...   Settings={symbols_enabled = [DYN_TEST1,DYN_TEST2,DYN_MULTIMAP]}
-  Expect Symbol  DYN_TEST1
+  Expect Symbol With Score  DYN_TEST1  10
   Do Not Expect Symbol  DYN_TEST2
 
 MAP - DYNAMIC SYMBOLS - SYM2
   Scan File  ${MESSAGE}  IP=127.0.0.1  Hostname=bar
   ...   Settings={symbols_enabled = [DYN_TEST1,DYN_TEST2,DYN_MULTIMAP]}
-  Expect Symbol  DYN_TEST2
+  Expect Symbol With Score  DYN_TEST2  20
   Do Not Expect Symbol  DYN_TEST1
 
 MAP - DYNAMIC SYMBOLS - MISS
diff --git a/test/functional/configs/maps/dynamic_symbols.map b/test/functional/configs/maps/dynamic_symbols.map
index ec92c74af4..e517d56384 100644
--- a/test/functional/configs/maps/dynamic_symbols.map
+++ b/test/functional/configs/maps/dynamic_symbols.map
@@ -1,2 +1,2 @@
-foo DYN_TEST1:10:opt1,opt2
-bar DYN_TEST2:20:opt3,opt4
+/foo/ DYN_TEST1:10:opt1,opt2
+/bar/ DYN_TEST2:20:opt3,opt4
diff --git a/test/functional/configs/merged-override.conf b/test/functional/configs/merged-override.conf
index 09ac005841..35f22630fc 100644
--- a/test/functional/configs/merged-override.conf
+++ b/test/functional/configs/merged-override.conf
@@ -252,6 +252,7 @@ multimap {
     type = "hostname";
     map = "{= env.TESTDIR =}/configs/maps/dynamic_symbols.map";
     dynamic_symbols = true;
+    regexp = true;
   }
 }