FIM IT: add fim sync overlap testing #3380

Deblintrake09 · 2022-09-29T15:31:15Z

Related issue
#3053

Description

This PR aims to add new tests related to the behavior of the response_timeout synchronization option. When a new sync is fired after the sync interval has elapsed, if response_timeout time has not elapsed since the last sync message, the sync interval value will be doubled. After a successful synchronization, when a new sync is fired, the interval value will be reset to the configured value.

Added

test_fim/test_synchronization/test_sync_overlap.py

Testing performed

The test test_max_eps.py module has erratic behavior and sometimes fails. It was fixed on Issue #3036, that was merged into the target branch, so it has not been fixed here again.

Tester	Component	Test path	Jenkins	Local	OS	Commit	Notes
@Deblintrake09	Manager	test_fim	🟡 🟡 🟡	🟡🟡🟡	Centos	`220a2e2`	Failing tests are fixed in target branch
@Deblintrake09	Agent	test_fim	🟢 🟢 🟢		Centos	`220a2e2`
@Deblintrake09	Agent	test_fim	🟢 🟢 🟢		Windows	`220a2e2`
@Deblintrake09	Agent	test_fim	🟢 🟢 🟢		Solaris	`220a2e2`
@Deblintrake09	Agent	test_fim	🟢 🟢 🟢		macOS	`220a2e2`
@damarisg (Reviewer)	Manager	test_fim	🟢	🚫	Centos	`220a2e2`
@damarisg (Reviewer)	Agent	test_fim	🟢	🚫	Centos	`220a2e2`
@damarisg (Reviewer)	Agent	test_fim	🟢	🚫	Windows	`220a2e2`
@damarisg (Reviewer)	Agent	test_fim	🟢	🚫	Solaris	`220a2e2`
@damarisg (Reviewer)	Agent	test_fim	🟢	🚫	macOS	`220a2e2`

deps/wazuh_testing/wazuh_testing/modules/fim/event_monitor.py

deps/wazuh_testing/wazuh_testing/tools/configuration.py

damarisg · 2022-10-13T18:46:55Z

tests/integration/test_fim/conftest.py

+@pytest.fixture(scope='function')
+def create_files_in_folder(files_number):
+    """Create files in monitored folder and files"""
+
+    for file in range(0, files_number):
+        create_file(REGULAR, MONITORED_DIR_1, f"test_file_{time.time()}_{file}")
+
+    yield
+
+    delete_path_recursively(MONITORED_DIR_1)
+
+


In tools/file.py file we store different methods related to files. Why don't you add it there?

Why don't you add the arguments in the documentation?

It is not added there because this is a fixture, and needs to be located in the conftest file.

damarisg · 2022-10-13T19:01:02Z

tests/integration/test_fim/conftest.py

+@pytest.fixture(scope='session')
+def configure_local_internal_options_fim():
+    """Fixture to configure the local internal options file."""
+
+    # Backup the old local internal options
+    backup_local_internal_options = get_wazuh_local_internal_options()
+
+    # Set the new local internal options configuration
+    set_wazuh_local_internal_options(create_local_internal_options(FIM_DEFAULT_LOCAL_INTERNAL_OPTIONS))
+
+    yield
+
+    # Backup the old local internal options cofiguration
+    set_wazuh_local_internal_options(backup_local_internal_options)


Why do you add it there? In the integration/conftest.py file are these methods.

I read the description, but could you clarify your decision applied here? I do not see sense.

This is not the same as the one in integration/conftest.py, which needs the get_local_internal_options fixture to be present in the test module, and that uses the get_configuration fixture.

damarisg · 2022-10-13T19:13:34Z

tests/integration/test_fim/conftest.py

+@pytest.fixture(scope="function")
+def restart_syscheck_function():
+    """
+    Restart syscheckd daemon.
+    """
+    control_service("stop", daemon="wazuh-syscheckd")
+    truncate_file(LOG_FILE_PATH)
+    control_service("start", daemon="wazuh-syscheckd")


Why do you add it there? In the integration/conftest.py file has defined it.

When you create a new method, you should make sure it doesn't exist elsewhere so as not to duplicate code.

This version This has been added here, following the structure applied to the VDT test suite refactor. Having a specific function that restarts only syscheck allows for tests to be a bit cleaner by not needing to pass the daemon to stop as a parameter.

tests/integration/test_fim/test_synchronization/data/test_cases/cases_sync_overlap.yaml

damarisg

I suggested some cases, but I didn't see them added. Was it for any reason?

Cases:

I don't put response_timeout and max_interval, and I have synchronization enabled.
- I don't put response_timeout, and I have synchronization enabled.
- I don't put max_interval, and I have synchronization enabled.
- I put response_timeout and max_interval, the interval is greater than max_interval , and I have synchronization enabled.
- the synchronization is done before the max_interval and interval is reached.

deps/wazuh_testing/wazuh_testing/modules/fim/event_monitor.py

Deblintrake09 · 2022-10-21T17:49:35Z

Update 2022/10/21

Applied requested changes
Added new test module test_sync_time
On Hold until Core does rebase on branch to run Jenkins instances.

tests/integration/test_fim/test_synchronization/test_sync_overlap.py

tests/integration/test_fim/test_synchronization/test_sync_time.py

tests/integration/test_fim/test_synchronization/test_sync_overlap.py

tests/integration/test_fim/test_synchronization/test_sync_time.py

…-sync-overlap-mechanism

Deblintrake09 · 2022-11-23T12:30:34Z

Update 2022/11/22

Launched test instances 🔴
- New sync tests fail. Expected messages did not appear
Agent Tests
Manager tests

Update 2022/11/23

Debug and manual test errors.
Ask Core about messages not appearing

Deblintrake09 added 22 commits September 14, 2022 11:09

feat(#3053): add callbacks to fim.event_monitor

5925a14

feat(#3053): add fixtures to fim conftest

cceaea9

feat(#3053): add test_sync_overlap test skeleton

a14e2a5

refactor(#3053): move CBs to fim.event_monitor

19fc49a

fix(#3053): add new case to test_sync_overlap

eed7a20

fix(#3053): fix truncate_monitored_files fixture

4151038

feat(#3053): add create_files_in_folder fixture

f77498c

docu(#3053): fix test_sync_interval docu and style

772fa4f

style(#3053): fix blank lines in conftest.py

94f22a5

docu(#3053): update changelog.md

5098130

style(#3053): fix spacing and indentations

f649ecf

style(#3053): update spacing and indentation

75c8c45

fix(#3053): fix config format to work on macOS

2796c98

fix(#3053): fix config format to work on macOS

d4e7555

fix(#3053): update spacing in configuration

d2a5269

fix(#3053): remove unnecesary list conversion

744d1e9

fix(#3053): fix and add cases test_sync_overlap

47e20b7

refactor(#3053): extract variables and callbacks

41b1d81

docs(#3053): update changelog.md

8513def

style(#3053): fix spacing

16f2002

fix(#3053): add monitored_dir parameter to test

978ced0

fix(#3053): fix invalid max_interval value test

2bad3e2

Deblintrake09 requested a review from damarisg September 29, 2022 15:31

Deblintrake09 self-assigned this Sep 29, 2022

Deblintrake09 added the pull-request/development label Sep 29, 2022

Deblintrake09 linked an issue Sep 29, 2022 that may be closed by this pull request

Tests development - Test for new FIM DB sync options #3053

Closed

damarisg requested changes Oct 13, 2022

View reviewed changes

docu(#3053): update event_monitor documentation

ef18eec

damarisg requested changes Oct 17, 2022

View reviewed changes

deps/wazuh_testing/wazuh_testing/modules/fim/event_monitor.py Outdated Show resolved Hide resolved

deps/wazuh_testing/wazuh_testing/modules/fim/event_monitor.py Outdated Show resolved Hide resolved

deps/wazuh_testing/wazuh_testing/modules/fim/event_monitor.py Outdated Show resolved Hide resolved

docu(#3053): fix fim.event_monitor docu

ebc42e1

Deblintrake09 added 5 commits October 21, 2022 14:14

feat(#3053): add new callbacks

e21ae6a

feat(#3053): new test_sync_time module

9ca0bdb

fix(#3053): remove unused callbacks

e1dcb2c

docu(#3053): update test_sync_time docu

112e1d6

style(#3053): fix test_sync_time spacing

26f9a61

style(#3053): fix test_sync_time spacing

b835ace

damarisg requested changes Oct 27, 2022

View reviewed changes

Deblintrake09 added 5 commits October 28, 2022 08:11

Merge branch '1915-fim-rsync-new-synchronization-mechanism' into 3053…

562fb8b

…-sync-overlap-mechanism

docs(#3053): update tests documentation

f21ac15

style(#3053): remove whitespaces

fe1859c

docs(#3053): added comments and docu

6b66bc8

style(#3053): fixed indentation issue

220a2e2

wazuh deleted a comment from Deblintrake09 Oct 28, 2022

Deblintrake09 requested a review from damarisg November 24, 2022 18:16

damarisg approved these changes Nov 25, 2022

View reviewed changes

damarisg merged commit b4581d1 into 1915-fim-rsync-new-synchronization-mechanism Nov 25, 2022

damarisg deleted the 3053-sync-overlap-mechanism branch November 25, 2022 14:24

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

FIM IT: add fim sync overlap testing #3380

FIM IT: add fim sync overlap testing #3380

Deblintrake09 commented Sep 29, 2022 •

edited by damarisg

Loading

damarisg Oct 13, 2022

Deblintrake09 Oct 17, 2022

damarisg Oct 13, 2022

Deblintrake09 Oct 17, 2022

damarisg Oct 13, 2022

Deblintrake09 Oct 17, 2022

damarisg left a comment

Deblintrake09 commented Oct 21, 2022

Deblintrake09 commented Nov 23, 2022 •

edited

Loading

FIM IT: add fim sync overlap testing #3380

FIM IT: add fim sync overlap testing #3380

Conversation

Deblintrake09 commented Sep 29, 2022 • edited by damarisg Loading

Description

Added

Testing performed

damarisg Oct 13, 2022

Choose a reason for hiding this comment

Deblintrake09 Oct 17, 2022

Choose a reason for hiding this comment

damarisg Oct 13, 2022

Choose a reason for hiding this comment

Deblintrake09 Oct 17, 2022

Choose a reason for hiding this comment

damarisg Oct 13, 2022

Choose a reason for hiding this comment

Deblintrake09 Oct 17, 2022

Choose a reason for hiding this comment

damarisg left a comment

Choose a reason for hiding this comment

Deblintrake09 commented Oct 21, 2022

Update 2022/10/21

Deblintrake09 commented Nov 23, 2022 • edited Loading

Update 2022/11/22

Update 2022/11/23

Deblintrake09 commented Sep 29, 2022 •

edited by damarisg

Loading

Deblintrake09 commented Nov 23, 2022 •

edited

Loading