Merge pull request #4577 from wazuh/merge-4.5.3-into-4.6.0

Merge 4.5.3 into 4.6.0
wazuh · Oct 6, 2023 · 226e09a · 226e09a
2 parents de9e19f + 75c431d
commit 226e09a
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 68 deletions.
diff --git a/.github/workflows/dependencies_validator.yaml b/.github/workflows/dependencies_validator.yaml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -73,19 +73,19 @@ Release report: TBD
 - Fix bug in the framework on migration tool ([#4027](https://github.com/wazuh/wazuh-qa/pull/4027)) \- (Framework)
 - Fix test cluster / integrity sync system test and configuration to avoid flaky behavior ([#4406](https://github.com/wazuh/wazuh-qa/pull/4406)) \- (Tests)
 
-## [4.5.3] - 28/09/2023
+## [4.5.3] - 10/10/2023
 
-Wazuh commit: https://github.com/wazuh/wazuh/commit/9087982b0c4ae0180bcdcd214a2b243e75cd8416 \
-Release report: https://github.com/wazuh/wazuh/issues/19111
+Wazuh commit: https://github.com/wazuh/wazuh/commit/388ce54b704d7b6aa2dda1b30258ad1642b26a2d \
+Release report: https://github.com/wazuh/wazuh/issues/19446
 
 ### Changed
 
-- Update setuptools dependency ([#3788](https://github.com/wazuh/wazuh-qa/pull/3788))
 - Update the cluster master logs reliability test to run with python 3.7 [#4445](https://github.com/wazuh/wazuh-qa/pull/4478) \- (Tests)
 - Update ITs URL for SUSE OVAL ([#4496](https://github.com/wazuh/wazuh-qa/pull/4496/))
 
 ### Fixed
 
+- Fix enrollment system tests ([#4562](https://github.com/wazuh/wazuh-qa/pull/4562/)) \- (Tests)
 - Update the request method used to call the login API endpoint. ([#4492](https://github.com/wazuh/wazuh-qa/pull/4492)) \- (Tests)
 - Enhancing the handling of authd and remoted simulators in case of restart failures ([#Wazuh-jenkins#3487](https://github.com/wazuh/wazuh-qa/pull/4205)) \- (Tests)
 - Fix py dependency version to install for Windows after the change to Python 3.11([#4523](https://github.com/wazuh/wazuh-qa/pull/4523)) \- (Framework)

diff --git a/deps/wazuh_testing/setup.py b/deps/wazuh_testing/setup.py
@@ -2,8 +2,8 @@
 # Created by Wazuh, Inc. <[email protected]>.
 # This program is free software; you can redistribute it and/or modify it under the terms of GPLv2
 import json
+from setuptools import setup, find_packages
 import os
-from setuptools import setup, find_namespace_packages
 
 package_data_list = [
     'data/agent.conf',
@@ -79,7 +79,7 @@ def get_version():
     author='Wazuh',
     author_email='[email protected]',
     license='GPLv2',
-    packages=find_namespace_packages(),
+    packages=find_packages(),
     package_data={'wazuh_testing': package_data_list},
     entry_points={'console_scripts': scripts_list},
     include_package_data=True,

diff --git a/requirements.txt b/requirements.txt
@@ -17,18 +17,18 @@ numpy>=1.18.1
 pandas>=1.1.5
 pillow>=6.2.0; platform_system == "Linux" or platform_system == "Darwin" or platform_system=='Windows'
 psutil>=5.6.6
-py~=1.10.0; python_version <= "3.9"
-py==1.11.0; python_version >= "3.10"
+py~=1.10.0; platform_system != "Windows" or python_version <= "3.10"
+py==1.11.0; platform_system == "Windows" and python_version >= "3.11"
 pycryptodome>=3.9.8
 pyOpenSSL==19.1.0
 pytest-html==3.1.1
 pytest==6.2.2 ; python_version <= "3.9"
-pytest==7.4.0 ; python_version >= "3.10"
+pytest==7.1.2 ; python_version >= "3.10"
 pyyaml==6.0.1
 requests>=2.23.0
 scipy>=1.0; platform_system == "Linux" or platform_system == "Darwin" or platform_system=='Windows'
 seaborn>=0.11.1; platform_system == "Linux" or platform_system == "Darwin" or platform_system=='Windows'
-setuptools==68.0.0
+setuptools~=56.0.0
 testinfra==5.0.0
 jq==1.1.2 ; (platform_system == "Linux" or platform_system == "Darwin") and python_version <= "3.9"
 jq==1.2.2 ; (platform_system == "Linux" or platform_system == "Darwin") and python_version >= "3.10"

diff --git a/tests/system/test_agent_auth/test_agent_auth.py b/tests/system/test_agent_auth/test_agent_auth.py
@@ -64,6 +64,7 @@ def clean_environment():
     host_manager.run_command('wazuh-manager', f"{WAZUH_PATH}/bin/manage_agents -r {agent_id}")
     host_manager.clear_file(host='wazuh-manager', file_path=os.path.join(WAZUH_PATH, 'etc', 'client.keys'))
     host_manager.clear_file(host='wazuh-agent1', file_path=os.path.join(WAZUH_PATH, 'etc', 'client.keys'))
+    host_manager.clear_file(host='wazuh-agent1', file_path=os.path.join(WAZUH_LOGS_PATH, 'ossec.log'))
 
 
 # IPV6 fixtures
@@ -234,7 +235,6 @@ def test_agent_auth(test_case, get_ip_directions, configure_network, modify_ip_a
     '''
     # Clean ossec.log and cluster.log
     host_manager.clear_file(host='wazuh-manager', file_path=os.path.join(WAZUH_LOGS_PATH, 'ossec.log'))
-    host_manager.clear_file(host='wazuh-agent1', file_path=os.path.join(WAZUH_LOGS_PATH, 'ossec.log'))
     host_manager.control_service(host='wazuh-manager', service='wazuh', state="restarted")
 
     # Start the agent enrollment process using agent-auth

diff --git a/tests/system/test_cluster/test_agent_enrollment/test_agent_enrollment.py b/tests/system/test_cluster/test_agent_enrollment/test_agent_enrollment.py
@@ -32,6 +32,7 @@ def clean_environment():
                                                   check=False)
     host_manager.control_service(host='wazuh-agent1', service='wazuh', state="stopped")
     host_manager.clear_file(host='wazuh-agent1', file_path=os.path.join(WAZUH_PATH, 'etc', 'client.keys'))
+    host_manager.clear_file(host='wazuh-agent1', file_path=os.path.join(WAZUH_LOGS_PATH, 'ossec.log'))
 
 
 def test_agent_enrollment(clean_environment):
@@ -40,7 +41,6 @@ def test_agent_enrollment(clean_environment):
     # Clean ossec.log and cluster.log
     host_manager.clear_file(host='wazuh-master', file_path=os.path.join(WAZUH_LOGS_PATH, 'ossec.log'))
     host_manager.clear_file(host='wazuh-worker1', file_path=os.path.join(WAZUH_LOGS_PATH, 'ossec.log'))
-    host_manager.clear_file(host='wazuh-agent1', file_path=os.path.join(WAZUH_LOGS_PATH, 'ossec.log'))
     host_manager.clear_file(host='wazuh-master', file_path=os.path.join(WAZUH_LOGS_PATH, 'cluster.log'))
     host_manager.clear_file(host='wazuh-worker1', file_path=os.path.join(WAZUH_LOGS_PATH, 'cluster.log'))
 

diff --git a/tests/system/test_enrollment/test_enrollment.py b/tests/system/test_enrollment/test_enrollment.py
@@ -72,6 +72,7 @@ def clean_environment():
 
     host_manager.clear_file(host='wazuh-manager', file_path=os.path.join(WAZUH_PATH, 'etc', 'client.keys'))
     host_manager.clear_file(host='wazuh-agent1', file_path=os.path.join(WAZUH_PATH, 'etc', 'client.keys'))
+    host_manager.clear_file(host='wazuh-agent1', file_path=os.path.join(WAZUH_LOGS_PATH, 'ossec.log'))
 
 
 # IPV6 fixtures
@@ -220,7 +221,6 @@ def test_agent_enrollment(test_case, get_ip_directions, configure_network, modif
     '''
     # Clean ossec.log and cluster.log
     host_manager.clear_file(host='wazuh-manager', file_path=os.path.join(WAZUH_LOGS_PATH, 'ossec.log'))
-    host_manager.clear_file(host='wazuh-agent1', file_path=os.path.join(WAZUH_LOGS_PATH, 'ossec.log'))
 
     # Start the agent enrollment process by restarting the wazuh-agent
     host_manager.control_service(host='wazuh-manager', service='wazuh', state="restarted")