aboutsummaryrefslogtreecommitdiffstats
path: root/test/functional/configs/merged.conf
diff options
context:
space:
mode:
authorIvan Stakhov <50211739+LeftTry@users.noreply.github.com>2024-06-03 15:29:11 +0500
committerGitHub <noreply@github.com>2024-06-03 11:29:11 +0100
commit2a1fa7d08ec1703fd47b37ab014699f001fb3344 (patch)
treec53cb691df0f0f62145092f14bd2ccbf2140543b /test/functional/configs/merged.conf
parentb8f807353115ca0f99e2ca20de42ff9f32fa234a (diff)
downloadrspamd-2a1fa7d08ec1703fd47b37ab014699f001fb3344.tar.gz
rspamd-2a1fa7d08ec1703fd47b37ab014699f001fb3344.zip
Upgraded replies and known senders modules (#4895)
* Made the individual replies_set for senders and their recipients. Made the global replies_set for verified recipients. * Made the individual replies_set for senders and their recipients. Made the global replies_set for verified recipients. * FIXED. Made the individual replies_set for senders and their recipients. Made the global replies_set for verified recipients. * Made the individual replies_set for senders and their recipients. Made the global replies_set for verified recipients. * Added pre-test for replies set * Update functional of replies_set * Few changes to replies and added check for incoming mail * Few changes in known_senders in check_known_incoming_mail_callback * Few changes in known_senders and replies * An attempt to write test(not tested) * Clean up * Clean up * Clean up * Added tests for replies and known_senders (all tests failed, debug required) * Moved replies test to the 001_merged * Cleared up code * Few changes to replies * Small changes in score of CHECK_INC_MAIL symbol * Small debug in known_senders * Plugin known_senders is fully working * Troubleshooting replies module * Changed symbol for check_known_incoming_mail_callback * Added test for failed incoming mail check * Little rework * Rewritten test for more appropriate * Rewritten tests for replies module. All test passed(debugging not adding to global set) * Debugged replies module * Replies module works and tested(needs performance improvements) * Cleaned up code * Improved readability and cleaned up code * Connected auth back(Tests not working, needs user) * Added test for incoming mail check in known senders module * Debugged. Works normally(tested, needs to add user) * Debug + clean up. Tested. Works. User auth required for tests * Improved performance * Small changes * Changed adding to global replies set logic + improved logs messaging * Added authenticated user to tests * Cleaned up * Made a few changes according to the comments on pull request * [Rework] Added removal of extra senders and recipients in global and local replies sets * [Minor] Small cleanup * [Minor] Cleaned up code * [Fix] Fixed call of incorrect function when making key * [Rework] Reworked scripts. Added ZADD redis call for local and global replies set * [Minor] Cleaned up code * [Fix] Improved performance and eliminated unnecessary invocations * [Minor] Reassigned script ids * [Feature] Made a check for local set * [Fix] Upgraded tests for known senders * [Fix] Upgraded tests for known senders * [Fix] Fixed performance of verification of local replies set * [Minor] Cleaned up code * [Feature] Added new test to the known_senders tests * [Test] Ubuntu test * [Fix] Fixing local replies test check * [Fix] Fixed code for local replies set check(was not working in previous versions of redis) * [Fix] Reorganized code to more convenient style and made better loading for scripts * [Minor] Code has been rewritten in a more appropriate format * [Minor] Fixed debug messaging * [Fix] Reworked expiration of replies sets * [Minor] Upgrade code style * [Fix] Small fix * [Feature] Change LFU logic of global replies set to LRU logic * Made the individual replies_set for senders and their recipients. Made the global replies_set for verified recipients. * Made the individual replies_set for senders and their recipients. Made the global replies_set for verified recipients. * FIXED. Made the individual replies_set for senders and their recipients. Made the global replies_set for verified recipients. * Made the individual replies_set for senders and their recipients. Made the global replies_set for verified recipients. * Added pre-test for replies set * Update functional of replies_set * Few changes to replies and added check for incoming mail * Few changes in known_senders in check_known_incoming_mail_callback * Few changes in known_senders and replies * An attempt to write test(not tested) * Clean up * Clean up * Clean up * Added tests for replies and known_senders (all tests failed, debug required) * Moved replies test to the 001_merged * Cleared up code * Few changes to replies * Small changes in score of CHECK_INC_MAIL symbol * Small debug in known_senders * Plugin known_senders is fully working * Troubleshooting replies module * Changed symbol for check_known_incoming_mail_callback * Added test for failed incoming mail check * Little rework * Rewritten test for more appropriate * Rewritten tests for replies module. All test passed(debugging not adding to global set) * Debugged replies module * Replies module works and tested(needs performance improvements) * Cleaned up code * Improved readability and cleaned up code * Connected auth back(Tests not working, needs user) * Added test for incoming mail check in known senders module * Debugged. Works normally(tested, needs to add user) * Debug + clean up. Tested. Works. User auth required for tests * Improved performance * Small changes * Changed adding to global replies set logic + improved logs messaging * Added authenticated user to tests * Cleaned up * Made a few changes according to the comments on pull request * [Rework] Added removal of extra senders and recipients in global and local replies sets * [Minor] Small cleanup * [Minor] Cleaned up code * [Fix] Fixed call of incorrect function when making key * [Rework] Reworked scripts. Added ZADD redis call for local and global replies set * [Minor] Cleaned up code * [Fix] Improved performance and eliminated unnecessary invocations * [Minor] Reassigned script ids * [Feature] Made a check for local set * [Fix] Upgraded tests for known senders * [Fix] Upgraded tests for known senders * [Fix] Fixed performance of verification of local replies set * [Minor] Cleaned up code * [Feature] Added new test to the known_senders tests * [Test] Ubuntu test * [Fix] Fixing local replies test check * [Fix] Fixed code for local replies set check(was not working in previous versions of redis) * [Fix] Reorganized code to more convenient style and made better loading for scripts * [Minor] Code has been rewritten in a more appropriate format * [Minor] Fixed debug messaging * [Fix] Reworked expiration of replies sets * [Minor] Upgrade code style * [Fix] Small fix * [Feature] Change LFU logic of global replies set to LRU logic * [Fix] Fix test conflict * [Minor] Revert rename * [Minor] Clean up code * [Fix] Fix commit history
Diffstat (limited to 'test/functional/configs/merged.conf')
-rw-r--r--test/functional/configs/merged.conf1
1 files changed, 1 insertions, 0 deletions
diff --git a/test/functional/configs/merged.conf b/test/functional/configs/merged.conf
index 0718d0210..2b3640048 100644
--- a/test/functional/configs/merged.conf
+++ b/test/functional/configs/merged.conf
@@ -35,5 +35,6 @@ lua = "{= env.TESTDIR =}/lua/magic.lua"
# 380_external_relay
lua = "{= env.TESTDIR =}/lua/external_relay.lua"
+
.include(priority=1,duplicate=merge) "{= env.TESTDIR =}/configs/merged-local.conf"
.include(priority=2,duplicate=replace) "{= env.TESTDIR =}/configs/merged-override.conf"