From 00cf84f8e07a79ac67a9ae0734c2448d561cbc39 Mon Sep 17 00:00:00 2001 From: Julia Date: Thu, 16 May 2024 17:29:08 +0200 Subject: [PATCH 1/2] fix: update timeout --- .../test_assign_groups_guess.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/system/test_cluster/test_agent_groups/test_assign_groups_guess.py b/tests/system/test_cluster/test_agent_groups/test_assign_groups_guess.py index 1afb93165a..6dedadd78e 100644 --- a/tests/system/test_cluster/test_agent_groups/test_assign_groups_guess.py +++ b/tests/system/test_cluster/test_agent_groups/test_assign_groups_guess.py @@ -48,6 +48,7 @@ from system import (ERR_MSG_CLIENT_KEYS_IN_MASTER_NOT_FOUND, check_agent_groups, check_keys_file, create_new_agent_group, delete_agent_group, remove_cluster_agents, assign_agent_to_new_group, restart_cluster) +from wazuh_testing import T_10, T_20 from wazuh_testing.tools.system import HostManager from wazuh_testing.tools.file import replace_regex_in_file from wazuh_testing.tools.system_monitoring import HostMonitor @@ -73,8 +74,6 @@ # Variables group_id = 'group_test' multigroups_id = 'default,group_test' -# this timeout is temporality, this test will be update -timeout = 20 # Fixtures @@ -135,7 +134,7 @@ def test_guess_single_group(target_node, status_guess_agent_group, clean_environ ''' # Restart master to apply local internal options restart_cluster([test_infra_managers[0]], host_manager) - time.sleep(timeout) + time.sleep(T_20) # Create new group create_new_agent_group(test_infra_managers[0], group_id, host_manager) @@ -156,7 +155,7 @@ def test_guess_single_group(target_node, status_guess_agent_group, clean_environ # Remove agent from default to test single group guess (not multigroup) host_manager.run_command(test_infra_managers[0], f"/var/ossec/bin/agent_groups -q -r -i {agent_id} -g default") - time.sleep(timeout) + time.sleep(T_20) # Check that agent has group set to group_test on Managers check_agent_groups(agent_id, group_id, test_infra_managers, host_manager) @@ -173,7 +172,7 @@ def test_guess_single_group(target_node, status_guess_agent_group, clean_environ # Restart agent restart_cluster([test_infra_agents[0]], host_manager) - time.sleep(timeout) + time.sleep(T_20) # Check if remoted.guess_agent_group is disabled expected_group = 'default' if int(status_guess_agent_group) == 0 else group_id @@ -228,7 +227,7 @@ def test_guess_multigroups(n_agents, target_node, status_guess_agent_group, clea ''' # Restart master to apply local internal options restart_cluster([test_infra_managers[0]], host_manager) - time.sleep(timeout) + time.sleep(T_20) # Create new group create_new_agent_group(test_infra_managers[0], group_id, host_manager) @@ -241,6 +240,7 @@ def test_guess_multigroups(n_agents, target_node, status_guess_agent_group, clea # Restart agent restart_cluster(test_infra_agents, host_manager) + time.sleep(T_10) # Check that agent has client key file for agent in range(n_agents): @@ -250,7 +250,7 @@ def test_guess_multigroups(n_agents, target_node, status_guess_agent_group, clea # Create new group and assing agent for agent in range(n_agents): assign_agent_to_new_group(test_infra_managers[0], group_id, agents_data[agent][1], host_manager) - time.sleep(timeout) + time.sleep(T_20) # Check that agent has group set to group_test on Managers for agent in range(n_agents): @@ -268,7 +268,7 @@ def test_guess_multigroups(n_agents, target_node, status_guess_agent_group, clea # Restart agent restart_cluster([test_infra_agents[0]], host_manager) - time.sleep(timeout) + time.sleep(T_20) # Check if remoted.guess_agent_group is disabled expected_group = 'default' if int(status_guess_agent_group) == 0 or n_agents == 1 else multigroups_id From 994b6018ac93a67ae8d9072293a13bec602214fa Mon Sep 17 00:00:00 2001 From: Julia Date: Fri, 17 May 2024 12:53:54 +0200 Subject: [PATCH 2/2] docs: update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2cddaa4c69..81fa16bc8c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -62,6 +62,7 @@ All notable changes to this project will be documented in this file. ### Fixed +- Fix multigroups guess system test ([#5396](https://github.com/wazuh/wazuh-qa/pull/5396)) \- (Tests) - Fix restart agent in change manager Vulnerability Detector E2E test case ([#5355](https://github.com/wazuh/wazuh-qa/pull/5355)) \- (Tests) - Fix E2E Vulnerability Detection Windows package installation error ([#5363](https://github.com/wazuh/wazuh-qa/pull/5363)) \- (Framework) - Fix shutdown messages system test ([#5298](https://github.com/wazuh/wazuh-qa/pull/5298)) \- (Framework + Tests)