Refactor integratord `test_integratord_read_json_file_deleted` #3540

fedepacher · 2022-10-31T18:52:13Z

Related issue
#3298

Description

This PR aims to add some changes to the development made by @mauromalara in this PR.

Added

tests/integration/test_integratord/test_alerts_reading.py: All modules were unified in this one and several changes were applied in the tests functions and documentation.

Updated

deps/wazuh_testing/modules/analysisd/__init__.py: Callback added to detect its initialization.
deps/wazuh_testing/modules/integratord/__init__.py: Callbacks modified to fix the tests.
deps/wazuh_testing/modules/integratord/event_monitor.py: Callback functions modified and documentation improved.
deps/wazuh_testing/wazuh_testing/tools/__init__.py: Integratord socket added.
tests/integration/conftest.py: Fixture improved and Slack webhook parameter added. Daemons handler modified and wrapper with 'function' scope added.
tests/integration/test_integratord/conftest.py: Minor improvements.
tests/integration/test_integratord/data/configuration/configuration_alerts_reading.yaml: Configuration template modified to change the integration from VTotal to Slack.
tests/integration/test_integratord/data/test_cases/cases_integratord_change_inode_alert.yaml: Virustotal integration replaced.
tests/integration/test_integratord/data/test_cases/cases_integratord_read_invalid_json_alerts.yaml: Virustotal integration replaced.
tests/integration/test_integratord/data/test_cases/cases_integratord_read_valid_json_alerts.yaml: Virustotal integration replaced.

Deleted

tests/integration/test_integratord/data/test_cases/cases_integratord_read_json_file_deleted.yaml: Test case deleted because it was duplicated by test_change_inode_alert
tests/integration/test_integratord/test_integratord_read_json_file_deleted.py: Test deleted because it was duplicated by test_change_inode_alert
tests/integration/test_integratord/test_integratord_change_inode_alert.py: All modules were unified in test_alerts_reading.py
tests/integration/test_integratord/test_integratord_read_json_alerts.py: All modules were unified in test_alerts_reading.py
tests/integration/test_integratord/test_integratord_read_json_alerts.py: All modules were unified in test_alerts_reading.py

Testing performed

Tester	Test path	Jenkins	Local	OS	Commit	Notes
@mauromalara (Developer)	test_integratord/	🟢 🟢 🟢	🟢 🟢 🟢 🟢 🟢	Ubuntu	`7b78001`	-
@Rebits (Reviewer)		⚫⚫⚫	🚫 🚫 🚫			Nothing to highlight

jmv74211 · 2022-11-22T13:24:50Z

tests/integration/conftest.py

@@ -293,12 +321,12 @@ def pytest_addoption(parser):
        help="run tests using a specific WPK package path"
    )
    parser.addoption(
-        "--integration-api-key",
+        "--slack-webhook-url",


Does this change imply new modifications in jenkins ITs repository?

PR: https://github.com/wazuh/wazuh-jenkins/pull/4023

jmv74211 · 2022-11-22T13:25:45Z

tests/integration/conftest.py

+        daemons.reverse()
+        for daemon in daemons:
+            logger.debug(f"Stopping {daemon}")
+            control_service('stop', daemon=daemon)


You are modifying a global fixture, so you have to guarantee that this change does not break anything.

IT Executions: #3540 (comment)

deps/wazuh_testing/wazuh_testing/tools/monitoring.py

deps/wazuh_testing/wazuh_testing/modules/integratord/__init__.py

tests/integration/test_integratord/conftest.py

mauromalara · 2023-02-03T09:05:46Z

Before merging these changes, it is necessary to merge this PR in the "wazuh-jenkins" repository.

More info: https://github.com/wazuh/wazuh-jenkins/issues/3838#issuecomment-1263990324

Also, it is necessary to merge the backport to 4.5 and create a backport of this PR to master. Also, it is necessary to apply these changes to 4.3

mauromalara · 2023-02-07T18:28:01Z

Wazuh Jenkins dependency

This PR depends on some changes to be merged in the wazuh-jenkins repo:

wazuh/wazuh-jenkins#4690
wazuh/wazuh-jenkins#5230

mauromalara · 2023-02-08T09:33:51Z

Affected tests execution

Tests affected by some changes in this PR:

tests/integration/test_active_response/test_analysisd/test_overwritten_rules_ar.py
tests/integration/test_analysisd/test_signature_id/test_signature_id.py

	R1	R2	R3
Local	🟢	🟢	🟢

mauromalara · 2023-02-09T09:10:59Z

Blocked by ⚠️

wazuh/wazuh-jenkins#4690

juliamagan

Please update branches and launch the tests to check that everything works as expected.

mauromalara · 2023-05-11T01:57:16Z

Last results

R1	R2	R3
🟢	🟢	🟢

Notes ⚠️

On Hold

This PR is waiting for #4126 because it depends on that fix to get merged.

Blocked by

Read this note.

mauromalara · 2023-05-12T19:22:21Z

After merging

~~Backport to 4.3 of the refactor made in Integratord #4165~~ (won't be worked because it is not expected to refactor an old test unless it does not work)
Merge the change in cascade: 4.5 > master

Rebits

LGTM

Branch updated and testing performed

fedepacher added the pull-request/production label Oct 31, 2022

fedepacher requested a review from Rebits October 31, 2022 18:52

jmv74211 suggested changes Nov 22, 2022

View reviewed changes

jmv74211 assigned fedepacher Nov 22, 2022

mauromalara linked an issue Feb 7, 2023 that may be closed by this pull request

The integration test test_integratord_read_json_file_deleted is failing #3298

Closed

mauromalara self-assigned this Feb 7, 2023

mauromalara force-pushed the 3298-refactor-integratord-test-4-4 branch 2 times, most recently from e5daf81 to b50ca53 Compare February 7, 2023 16:21

mauromalara mentioned this pull request Feb 9, 2023

Refactor wazuh-integratord integration tests - Backport to 4.3 #3915

Closed

fedepacher and others added 13 commits February 22, 2023 15:49

refactor(#3298): refactor integratord tests to use slack

c236371

refactor(#3298): refactor test variables and add callback function

0696b33

refactor(#3298): refactor test timeout

adb6a69

refactor(#3298): add new line to changelog file

70ea041

refactor(#3298): refactor code style

5d7b1d0

refactor(#3298): create event_monitor function for each log to find.

825fbe9

refactor: make some improvements to integratord tests

3d8a6a8

refactor(#3298): remove json_file_deleted test.

fdee9e2

refactor(#3298): add a daemons_handler function-scoped.

96aa5aa

refactor(#3298): apply multiple changes to integratord monitor.

1202581

refactor(#3298): refactor, fix, and unified several tests.

b00e663

fix(#3298): apply linter corrections.

020d61e

fix(#3298): fix identation error in config file.

13d40bc

mauromalara force-pushed the 3298-refactor-integratord-test-4-4 branch from 7b78001 to 13d40bc Compare February 22, 2023 16:33

jmv74211 removed the pull-request/production label Mar 14, 2023

juliamagan previously requested changes May 9, 2023

View reviewed changes

mauromalara force-pushed the 3298-refactor-integratord-test-4-4 branch from 13d40bc to 5b4a56c Compare May 10, 2023 17:43

mauromalara force-pushed the 3298-refactor-integratord-test-4-4 branch 3 times, most recently from ee35dd5 to 13d40bc Compare May 10, 2023 19:57

mauromalara added 2 commits May 10, 2023 20:05

merge(#3298): merge 4.4 into 3298-refactor-integratord-test-4-4

5e86677

docs(#3298): update change in changelog.

e80ff77

mauromalara mentioned this pull request May 12, 2023

Backport to 4.3 of the refactor made in Integratord #4165

Closed

Rebits approved these changes May 30, 2023

View reviewed changes

merge(#3928): 4.4

aa1356d

Rebits merged commit 3cb5df4 into 4.4 Jun 1, 2023

Rebits deleted the 3298-refactor-integratord-test-4-4 branch June 1, 2023 13:10

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactor integratord `test_integratord_read_json_file_deleted` #3540

Refactor integratord `test_integratord_read_json_file_deleted` #3540

fedepacher commented Oct 31, 2022 •

edited by mauromalara

Loading

jmv74211 Nov 22, 2022

mauromalara Feb 7, 2023

jmv74211 Nov 22, 2022

mauromalara Feb 8, 2023

mauromalara commented Feb 3, 2023 •

edited

Loading

mauromalara commented Feb 7, 2023 •

edited

Loading

mauromalara commented Feb 8, 2023 •

edited

Loading

mauromalara commented Feb 9, 2023 •

edited

Loading

juliamagan left a comment

mauromalara commented May 11, 2023 •

edited

Loading

mauromalara commented May 12, 2023 •

edited

Loading

Rebits left a comment •

edited

Loading

Refactor integratord test_integratord_read_json_file_deleted #3540

Refactor integratord test_integratord_read_json_file_deleted #3540

Conversation

fedepacher commented Oct 31, 2022 • edited by mauromalara Loading

Description

Added

Updated

Deleted

Testing performed

jmv74211 Nov 22, 2022

Choose a reason for hiding this comment

mauromalara Feb 7, 2023

Choose a reason for hiding this comment

jmv74211 Nov 22, 2022

Choose a reason for hiding this comment

mauromalara Feb 8, 2023

Choose a reason for hiding this comment

mauromalara commented Feb 3, 2023 • edited Loading

mauromalara commented Feb 7, 2023 • edited Loading

Wazuh Jenkins dependency

mauromalara commented Feb 8, 2023 • edited Loading

Affected tests execution

mauromalara commented Feb 9, 2023 • edited Loading

Blocked by ⚠️

juliamagan left a comment

Choose a reason for hiding this comment

mauromalara commented May 11, 2023 • edited Loading

Last results

Notes ⚠️

On Hold

Blocked by

mauromalara commented May 12, 2023 • edited Loading

After merging

Rebits left a comment • edited Loading

Choose a reason for hiding this comment

Refactor integratord `test_integratord_read_json_file_deleted` #3540

Refactor integratord `test_integratord_read_json_file_deleted` #3540

fedepacher commented Oct 31, 2022 •

edited by mauromalara

Loading

mauromalara commented Feb 3, 2023 •

edited

Loading

mauromalara commented Feb 7, 2023 •

edited

Loading

mauromalara commented Feb 8, 2023 •

edited

Loading

mauromalara commented Feb 9, 2023 •

edited

Loading

mauromalara commented May 11, 2023 •

edited

Loading

mauromalara commented May 12, 2023 •

edited

Loading

Rebits left a comment •

edited

Loading