Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adapt to multi_groups modifications #3565

Merged
merged 3 commits into from
Jan 19, 2023
Merged

Conversation

QU3B1M
Copy link
Member

@QU3B1M QU3B1M commented Nov 4, 2022

Related issue
#3369

Description

This PR aims to fix future errors that will occur when the changes from 15074 are implemented in wazuh master. It does not implement any new test case, it is just a fix to avoid existing test cases to fail.

Updated

  • Modify callback_pattern in deps/wazuh_testing/wazuh_testing/remote.py
  • Modify expected condition in tests/integration/test_remoted/test_multi_groups/test_merged_mg_file_content.py

Testing performed

Tester Test path Jenkins Local OS Commit Notes
@QU3B1M(Developer) integration/test_remoted/test_multi_groups/test_merged_mg_file_content.py 🟢 🟢 🟢 🟢 🟢 🟢 Ubuntu 20 2e1d85b Nothing to highlight
@user (Reviewer) ⚫⚫⚫ 🚫 🚫 🚫 Nothing to highlight

@QU3B1M
Copy link
Member Author

QU3B1M commented Nov 7, 2022

Linting fails

The actual linting errors are in a part of the code that is unaffected by this commit, take note that this just a hotfix to adapt the actual code to the multi_groups modifications, it does not include any new test case nor major modification, only minor changes.
This is a modification by @TomasTurina that I normalized and then created this PR

@QU3B1M QU3B1M added this to the DEV testing - 4.5.0 milestone Nov 7, 2022
jmv74211
jmv74211 previously approved these changes Nov 11, 2022
@jmv74211 jmv74211 removed this from the Release 4.5.0 milestone Dec 20, 2022
@jmv74211 jmv74211 merged commit 640f7fe into master Jan 19, 2023
@jmv74211 jmv74211 deleted the 14733_optimize_multigroups_cpu branch January 19, 2023 16:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Remoted process at 100% of CPU usage in a Wazuh master node without agents
3 participants