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.

Sign up for GitHub

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

Increase E2E Vulnerability detection change manager test timeout #5414

Merged
merged 3 commits into from
May 23, 2024
Merged

Increase E2E Vulnerability detection change manager test timeout #5414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
38dc5c3
fix: increase E2E VD package timeout for each agent in env
Rebits May 22, 2024
9d935cb
docs: include 5414 changelog
Rebits May 22, 2024
7de9cfa
Merge branch '4.8.0' into fix/5413-increase-change-manager-test-timeout
Rebits May 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ All notable changes to this project will be documented in this file.

### Fixed

- Increase E2E Vulnerability detection change manager test timeout ([#5414](https://github.com/wazuh/wazuh-qa/pull/5414)) \- (Tests)
- Fix filter vulnerabilities function in case of multiple packages are used ([#5419](https://github.com/wazuh/wazuh-qa/pull/5419)) \- (Framework)
- Remove false positive from E2E Vulnerability Detection tests ([#5369](https://github.com/wazuh/wazuh-qa/pull/5369)) \- (Framework)
- Fix multigroups guess system test ([#5396](https://github.com/wazuh/wazuh-qa/pull/5396)) \- (Tests)
Expand Down
8 changes: 4 additions & 4 deletions tests/end_to_end/test_vulnerability_detector/test_vulnerability_detector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
from wazuh_testing.end_to_end.utils import (extract_case_info, get_case_ids,
load_test_cases)
from wazuh_testing.end_to_end.vulnerability_detector import (TIMEOUT_PER_AGENT_VULNERABILITY_FIRST_SCAN,
PACKAGE_VULNERABILITY_SCAN_TIME,
get_vulnerabilities_from_states_by_agent)
from wazuh_testing.end_to_end.waiters import wait_until_vd_is_updated
from wazuh_testing.tools.system import HostManager
Expand All @@ -77,7 +78,6 @@
FIRST_SCAN_TIME = None
FIRST_SCAN_VULNERABILITIES_INDEX = {}
AGENT_REGISTRATION_TIMEOUT = 15
PACKAGE_VULNERABILITY_SCAN_TIME = 120

VULNERABILITY_DETECTION_E2E_EXPECTED_ERRORS = [
r"Invalid ID \d{3} for the source",
Expand Down Expand Up @@ -698,7 +698,7 @@ def test_install_vulnerable_package_when_agent_down(self, host_manager, request,
host_manager.control_environment("start", ["agent"], parallel=True)

time.sleep(AGENT_REGISTRATION_TIMEOUT * len(AGENTS_SCANNED_FIRST_SCAN))
time.sleep(VD_E2E_TIMEOUT_SYSCOLLECTOR_SCAN + PACKAGE_VULNERABILITY_SCAN_TIME)
time.sleep(VD_E2E_TIMEOUT_SYSCOLLECTOR_SCAN + PACKAGE_VULNERABILITY_SCAN_TIME * len(AGENTS_SCANNED_FIRST_SCAN))

package_data = [body["package"]]

Expand Down Expand Up @@ -787,7 +787,7 @@ def test_change_agent_manager(self, permutate_agents_managers, request, precondi
)

# Wait for Syscollector and VD Scan
time.sleep(VD_E2E_TIMEOUT_SYSCOLLECTOR_SCAN + PACKAGE_VULNERABILITY_SCAN_TIME)
time.sleep(VD_E2E_TIMEOUT_SYSCOLLECTOR_SCAN + PACKAGE_VULNERABILITY_SCAN_TIME * len(AGENTS_SCANNED_FIRST_SCAN))

package_data = [body["package"]]

Expand Down Expand Up @@ -916,7 +916,7 @@ def test_vulnerability_detector_scans_cases(self, request, preconditions, body,
[Evidence("operation_results", operations_result)],
)
# Wait for syscollector and VD scan
time.sleep(VD_E2E_TIMEOUT_SYSCOLLECTOR_SCAN + PACKAGE_VULNERABILITY_SCAN_TIME)
time.sleep(VD_E2E_TIMEOUT_SYSCOLLECTOR_SCAN + PACKAGE_VULNERABILITY_SCAN_TIME * len(AGENTS_SCANNED_FIRST_SCAN))

if "to" in body["package"]:
package_data = [body["package"]["to"], body["package"]["from"]]
Expand Down
Loading