From 418115e89f58c86579d56231372333d85744c4d3 Mon Sep 17 00:00:00 2001 From: Deblintrake09 Date: Fri, 9 Sep 2022 10:46:55 -0300 Subject: [PATCH] docu(#3036): update tests min version --- deps/wazuh_testing/wazuh_testing/fim_module/__init__.py | 3 ++- .../test_file_limit/test_file_limit_capacity_alerts.py | 2 +- .../test_files/test_file_limit/test_file_limit_default.py | 4 +--- .../test_files/test_file_limit/test_file_limit_delete_full.py | 2 +- .../test_files/test_file_limit/test_file_limit_full.py | 3 +-- .../test_files/test_file_limit/test_file_limit_no_limit.py | 4 +--- .../test_files/test_file_limit/test_file_limit_values.py | 4 +--- 7 files changed, 8 insertions(+), 14 deletions(-) diff --git a/deps/wazuh_testing/wazuh_testing/fim_module/__init__.py b/deps/wazuh_testing/wazuh_testing/fim_module/__init__.py index ec5ccf61c0..aea311cac0 100644 --- a/deps/wazuh_testing/wazuh_testing/fim_module/__init__.py +++ b/deps/wazuh_testing/wazuh_testing/fim_module/__init__.py @@ -47,7 +47,7 @@ CB_DATABASE_FULL_COULD_NOT_INSERT_VALUE = r".*Couldn't insert ('.*')? value entry into DB\. The DB is full.*" CB_FILE_LIMIT_VALUE = r".*Maximum number of entries to be monitored: '(\d+)'" CB_FILE_SIZE_LIMIT_BIGGER_THAN_DISK_QUOTA = r".*Setting 'disk_quota' to (\d+), 'disk_quota' must be greater than 'file_size'" -CB_FILE_LIMIT_DISABLED = r".*(No limit set) to maximum number of entries to be monitored" +CB_FILE_LIMIT_DISABLED = r".*(No limit set) to maximum number of file entries to be monitored" CB_INODE_ENTRIES_PATH_COUNT = r".*Fim inode entries: '(\d+)', path count: '(\d+)'" CB_FIM_ENTRIES_COUNT = r".*Fim entries: (\d+)" CB_DETECT_FIM_EVENT = r'.*Sending FIM event: (.+)$' @@ -55,6 +55,7 @@ CB_IGNORING_DUE_TO_PATTERN = r".*?Ignoring path '(.*)' due to pattern '(.*)'.*" + # Error Messages ERR_MSG_DATABASE_PERCENTAGE_FULL_ALERT = 'Did not receive expected "DEBUG: ...: Sending DB ...% full alert." event' ERR_MSG_FIM_INODE_ENTRIES = 'Did not receive expected "Fim inode entries: ..., path count: ..." event' diff --git a/tests/integration/test_fim/test_files/test_file_limit/test_file_limit_capacity_alerts.py b/tests/integration/test_fim/test_files/test_file_limit/test_file_limit_capacity_alerts.py index 806a392d97..723071483b 100644 --- a/tests/integration/test_fim/test_files/test_file_limit/test_file_limit_capacity_alerts.py +++ b/tests/integration/test_fim/test_files/test_file_limit/test_file_limit_capacity_alerts.py @@ -128,7 +128,7 @@ def test_file_limit_capacity_alert(percentage, get_configuration, configure_envi the total and when the number is less than that percentage. Finally, the test will verify that on the FIM event, inodes and monitored files number match. - wazuh_min_version: 4.2.0 + wazuh_min_version: 4.5.0 tier: 1 diff --git a/tests/integration/test_fim/test_files/test_file_limit/test_file_limit_default.py b/tests/integration/test_fim/test_files/test_file_limit/test_file_limit_default.py index 5ac51a8ab7..6cfd0b83bb 100644 --- a/tests/integration/test_fim/test_files/test_file_limit/test_file_limit_default.py +++ b/tests/integration/test_fim/test_files/test_file_limit/test_file_limit_default.py @@ -102,8 +102,6 @@ def get_configuration(request): # Tests - -@pytest.mark.skipif(sys.platform == 'win32', reason="Blocked by wazuh/wazuh#11819") def test_file_limit_default(get_configuration, configure_environment, restart_syscheckd): ''' description: Check if the maximum number of files monitored by the 'wazuh-syscheckd' daemon is set to default @@ -111,7 +109,7 @@ def test_file_limit_default(get_configuration, configure_environment, restart_sy a directory and wait for FIM to start and generate an event indicating the maximum number of files to monitor. Finally, the test will verify that this number matches the default value (100000). - wazuh_min_version: 4.2.0 + wazuh_min_version: 4.5.0 tier: 1 diff --git a/tests/integration/test_fim/test_files/test_file_limit/test_file_limit_delete_full.py b/tests/integration/test_fim/test_files/test_file_limit/test_file_limit_delete_full.py index 780bfc0375..db0b8bb75d 100644 --- a/tests/integration/test_fim/test_files/test_file_limit/test_file_limit_delete_full.py +++ b/tests/integration/test_fim/test_files/test_file_limit/test_file_limit_delete_full.py @@ -135,7 +135,7 @@ def test_file_limit_delete_full(folder, file_name, get_configuration, configure_ no FIM events to be generated (file limit reached). Finally, it will delete 'test_file10' and verify that the 'deleted' FIM event matches that file. - wazuh_min_version: 4.2.0 + wazuh_min_version: 4.5.0 tier: 1 diff --git a/tests/integration/test_fim/test_files/test_file_limit/test_file_limit_full.py b/tests/integration/test_fim/test_files/test_file_limit/test_file_limit_full.py index bbd52d429b..58340b173e 100644 --- a/tests/integration/test_fim/test_files/test_file_limit/test_file_limit_full.py +++ b/tests/integration/test_fim/test_files/test_file_limit/test_file_limit_full.py @@ -120,7 +120,6 @@ def extra_configuration_before_yield(): # Tests - def test_file_limit_full(get_configuration, configure_environment, restart_syscheckd): ''' description: Check if the 'wazuh-syscheckd' daemon generates proper events while the FIM database is in @@ -130,7 +129,7 @@ def test_file_limit_full(get_configuration, configure_environment, restart_sysch when a new testing file is added to the monitored directory. Finally, the test will verify that on the FIM event, inodes and monitored files number match. - wazuh_min_version: 4.2.0 + wazuh_min_version: 4.5.0 tier: 1 diff --git a/tests/integration/test_fim/test_files/test_file_limit/test_file_limit_no_limit.py b/tests/integration/test_fim/test_files/test_file_limit/test_file_limit_no_limit.py index ca30e57253..473e4e7311 100644 --- a/tests/integration/test_fim/test_files/test_file_limit/test_file_limit_no_limit.py +++ b/tests/integration/test_fim/test_files/test_file_limit/test_file_limit_no_limit.py @@ -116,15 +116,13 @@ def get_configuration(request): # Tests - -@pytest.mark.skipif(sys.platform == 'win32', reason="Blocked by wazuh/wazuh #11162") def test_file_limit_no_limit(get_configuration, configure_environment, restart_syscheckd): ''' description: Check if the 'wazuh-syscheckd' daemon detects that the 'file_limit' feature of FIM is disabled. For this purpose, the test will monitor a testing directory, and finally, it will verify that the FIM event 'no limit' is generated. - wazuh_min_version: 4.2.0 + wazuh_min_version: 4.5.0 tier: 1 diff --git a/tests/integration/test_fim/test_files/test_file_limit/test_file_limit_values.py b/tests/integration/test_fim/test_files/test_file_limit/test_file_limit_values.py index d909972d70..2f38a70d39 100644 --- a/tests/integration/test_fim/test_files/test_file_limit/test_file_limit_values.py +++ b/tests/integration/test_fim/test_files/test_file_limit/test_file_limit_values.py @@ -122,8 +122,6 @@ def extra_configuration_before_yield(): # Tests - -@pytest.mark.skipif(sys.platform == 'win32', reason="Blocked by wazuh/wazuh #11819") def test_file_limit_values(get_configuration, configure_environment, restart_syscheckd): ''' description: Check if the 'wazuh-syscheckd' daemon detects that the value of the 'entries' tag, which corresponds @@ -132,7 +130,7 @@ def test_file_limit_values(get_configuration, configure_environment, restart_sys is generated and has the correct value. Finally, the test will verify that on the FIM event, inodes and monitored files number match. - wazuh_min_version: 4.2.0 + wazuh_min_version: 4.5.0 tier: 1