Fix rspamd tests

Author: chkpnt

Diff for: tests/tests/configuration/RspamdTest.yml

@@ -172,7 +172,7 @@
           {
             "allow_raw_input": true,
             "cache_file": "/var/lib/rspamd/symbols.cache",
-            "check_all_filters": true,
+            "check_all_filters": false,
             "classify_headers": [
               "User-Agent",
               "X-Mailer",
@@ -190,6 +190,7 @@
             },
             "dns_max_requests": 64,
             "dynamic_conf": "/var/lib/rspamd/rspamd_dynamic",
+            "enable_mime_utf": false,
             "explicit_modules": [
               "settings",
               "bayes_expiry"
@@ -208,7 +209,6 @@
             "max_urls": 10240,
             "one_shot": false,
             "pidfile": "/var/run/rspamd/rspamd.pid",
-            "raw_mode": false,
             "rrd": "/var/lib/rspamd/rspamd.rrd",
             "soft_reject_on_timeout": false,
             "stats_file": "/var/lib/rspamd/stats.ucl",

Diff for: tests/tests/incoming/ReceiveMailTest.yml

@@ -54,7 +54,7 @@
           To: [email protected]
           Subject: Test
           ...
-          X-Spamd-Result: default: False [7.60 / 15.00];
+          X-Spamd-Result: default: False [7.70 / 15.00];
           $$ \t $$HFILTER_FROMHOST_NOT_FQDN(3.00)[localhost];
           $$ \t $$HFILTER_HELO_5(3.00)[localhost];
           ...

Diff for: tests/tests/spam-handling/LearnHamByCopyingIntoHamFolderTest.yml

@@ -5,9 +5,9 @@
 - hosts: client
   tasks:
     - name: Send a mail from client to an address SUT is responsible for
-      ansible.builtin.shell: |
-        echo "Test-Body" | mailx -s "Test" [email protected]
-
+      ansible.builtin.shell: >
+        echo "Test-Body that needs to be a little bit longer to reach the required
+          number of tokens for bayes classifier." | mailx -s "Test" [email protected]
     - name: Copy the mail from the inbox into the Ham folder
       ansible.builtin.shell: |
         log_file -noappend imap.log

Diff for: tests/tests/spam-handling/LearnHamByFlaggingTest.yml

@@ -6,9 +6,8 @@
   tasks:
     - name: Send two mails from client to an address SUT is responsible for
       ansible.builtin.shell: |
-        echo "Test-Body blub" | mailx -s "Test 1" [email protected]
-        echo "Different text" | mailx -s "Test 2" [email protected]
-
+          echo "Test-Body that needs to be a little bit longer to reach the required number of tokens for bayes classifier." | mailx -s "Test 1" [email protected]
+          echo "Different text that needs to be a little bit longer to reach the required number of tokens for bayes classifier." | mailx -s "Test 1" [email protected]
     - name: Simulate marking the first mail with a green flag (iOS Mail App) and flag the second as NonJunk
       ansible.builtin.shell: |
         log_file -noappend imap.log

Diff for: tests/tests/spam-handling/LearnSpamByFlaggingTest.yml

@@ -5,8 +5,9 @@
 - hosts: client
   tasks:
     - name: Send a mail from client to an address SUT is responsible for
-      ansible.builtin.shell: |
-        echo "Test-Body" | mailx -s "Test" [email protected]
+      ansible.builtin.shell: >
+        echo "Test-Body that needs to be a little bit longer to reach the required
+          number of tokens for bayes classifier." | mailx -s "Test" [email protected]
     - name: Simulate flagging the mail as Junk as Thunderbird would do
       ansible.builtin.shell: |
         log_file -noappend imap.log

Diff for: tests/tests/spam-handling/LearnSpamByMovingIntoSpamFolderTest.yml

@@ -5,8 +5,9 @@
 - hosts: client
   tasks:
     - name: Send a mail from client to an address SUT is responsible for
-      ansible.builtin.shell: |
-        echo "Test-Body" | mailx -s "Test" [email protected]
+      ansible.builtin.shell: >
+        echo "Test-Body that needs to be a little bit longer to reach the required
+          number of tokens for bayes classifier." | mailx -s "Test" [email protected]
     - name: Move the mail from the inbox into the Spam folder
       ansible.builtin.shell: |
         log_file -noappend imap.log