From 29aff269b5f5bd128f2696551eebff306af7abd2 Mon Sep 17 00:00:00 2001 From: fedepacher Date: Mon, 31 Oct 2022 12:12:24 -0300 Subject: [PATCH 1/3] refactor(#3429): skip test due to a future refactor --- tests/integration/test_agentd/test_agentd_multi_server.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/integration/test_agentd/test_agentd_multi_server.py b/tests/integration/test_agentd/test_agentd_multi_server.py index 3666fe053c..a0b732dd85 100644 --- a/tests/integration/test_agentd/test_agentd_multi_server.py +++ b/tests/integration/test_agentd/test_agentd_multi_server.py @@ -386,6 +386,7 @@ def wait_until(x, log_str): # @pytest.mark.parametrize('test_case', [case for case in tests]) +@pytest.mark.skip(reason='https://github.com/wazuh/wazuh-qa/issues/3536') def test_agentd_multi_server(add_hostnames, configure_authd_server, set_authd_id, clean_keys, configure_environment, get_configuration): ''' From 40b9544d96f9d010484236a408c6acf990e3c641 Mon Sep 17 00:00:00 2001 From: fedepacher Date: Mon, 31 Oct 2022 12:31:39 -0300 Subject: [PATCH 2/3] refactor(#3429): refactor code style and add changelog comment --- CHANGELOG.md | 1 + tests/integration/test_agentd/test_agentd_multi_server.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 57dec8187c..a7714fd2a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,6 +34,7 @@ Release report: TBD ### Changed +- Skip test_agentd_multi_server.py ([#3538](https://github.com/wazuh/wazuh-qa/pull/3538)) - Update wazuhdb_getconfig and EPS limit integration tests ([#3146](https://github.com/wazuh/wazuh-qa/pull/3146)) \- (Tests) - Refactor: logcollector `test_only_future_events` according to new standard. ([3484](https://github.com/wazuh/wazuh-qa/pull/3484)) \- (Framework + Tests) - Change required version of urllib3 and requests dependencies ([#3315](https://github.com/wazuh/wazuh-qa/pull/3315)) \- (Framework) diff --git a/tests/integration/test_agentd/test_agentd_multi_server.py b/tests/integration/test_agentd/test_agentd_multi_server.py index a0b732dd85..de57c316c4 100644 --- a/tests/integration/test_agentd/test_agentd_multi_server.py +++ b/tests/integration/test_agentd/test_agentd_multi_server.py @@ -159,7 +159,7 @@ f"Received message: '#!-agent ack '" ], [ - #f'Lost connection with manager. Setting lock.', + # f'Lost connection with manager. Setting lock.', f'Trying to connect to server ([{SERVER_HOSTS[0]}]:{REMOTED_PORTS[0]}', f'Trying to connect to server ([{SERVER_HOSTS[1]}]:{REMOTED_PORTS[1]}', f'Connected to the server ([{SERVER_HOSTS[1]}]:{REMOTED_PORTS[1]}', From 615001f5ac519b74087e0622fad0e58efab74ea2 Mon Sep 17 00:00:00 2001 From: jmv74211 Date: Wed, 2 Nov 2022 17:33:20 +0100 Subject: [PATCH 3/3] docs: update changelog line --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a7714fd2a7..9983f3903c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,7 +34,7 @@ Release report: TBD ### Changed -- Skip test_agentd_multi_server.py ([#3538](https://github.com/wazuh/wazuh-qa/pull/3538)) +- Skip unstable integration test for agentd ([#3538](https://github.com/wazuh/wazuh-qa/pull/3538)) - Update wazuhdb_getconfig and EPS limit integration tests ([#3146](https://github.com/wazuh/wazuh-qa/pull/3146)) \- (Tests) - Refactor: logcollector `test_only_future_events` according to new standard. ([3484](https://github.com/wazuh/wazuh-qa/pull/3484)) \- (Framework + Tests) - Change required version of urllib3 and requests dependencies ([#3315](https://github.com/wazuh/wazuh-qa/pull/3315)) \- (Framework)