Fix test_synchronization system test

tests/system/__init__.py

@@ -22,9 +22,9 @@
 
 
 # Functions
-def get_agent_id(host_manager):
+def get_agent_id(host_manager, node='wazuh-master'):
  # Gets the first agent id in the master's client.keys file
- return host_manager.run_command('wazuh-master', f'cut -c 1-3 {WAZUH_PATH}/etc/client.keys')
+ return host_manager.run_command(node, f'cut -c 1-3 {WAZUH_PATH}/etc/client.keys')
 
 
 def get_id_from_agent(agent, host_manager):

tests/system/provisioning/one_manager_agent/roles/manager-role/tasks/main.yml

@@ -79,7 +79,10 @@
 - name: Start Wazuh
  command: /var/ossec/bin/wazuh-control restart
 
-- name: Create script to check BD
+- name: Copy wdb-query.py script
  copy:
- src: ../../../../../scripts/system_query_db.py
- dest: /var/
+ src: ../../../../scripts/wdb-query.py
+ dest: /var/ossec/bin/wdb-query.py
+ owner: root
+ group: root
+ mode: '0644'

tests/system/test_fim/test_synchronization/test_synchronization.py

@@ -41,15 +41,16 @@
 """
 
 import os
-import json
 import pytest
+import re
 from time import sleep
 
 
+from system import execute_wdb_query, get_agent_id
 from wazuh_testing.tools.system_monitoring import HostMonitor
 from wazuh_testing.tools.system import HostManager, clean_environment
 from wazuh_testing.tools import WAZUH_LOGS_PATH
-from wazuh_testing.fim import create_folder_file, query_db
+from wazuh_testing.fim import create_folder_file
 
 
 pytestmark = [pytest.mark.one_manager_agent_env]
@@ -67,8 +68,6 @@
  ]
 tmp_path = os.path.join(local_path, 'tmp')
 scheduled_mode = 'testdir1'
-db_path = '/var/ossec/queue/db/001.db'
-db_script = '/var/system_query_db.py'
 enviroment_files = [('wazuh-manager', os.path.join(WAZUH_LOGS_PATH, 'ossec.log')),
  ('wazuh-agent1', os.path.join(WAZUH_LOGS_PATH, 'ossec.log'))]
 
@@ -136,6 +135,7 @@ def test_synchronization(folder_path, case, host):
  host_manager.run_command('wazuh-agent1', f'rm -rf {folder_path}')
  folder_path = f"'/{folder_path}/{folder_path}.txt'"
  query = " select * from fim_entry where full_path='\"{}\"'".format(folder_path)
+ agent_id = get_agent_id(host_manager, 'wazuh-manager')
 
  # Start host
  host_manager.run_command(host, '/var/ossec/bin/wazuh-control start')
@@ -150,8 +150,9 @@ def test_synchronization(folder_path, case, host):
  if (case == 'delete'):
  # Execute query to DB
  sleep(5)
- result = query_db(host_manager, db_script, db_path, f'\"{query}\"')
- assert not json.loads(result)
+ result = execute_wdb_query(f"{agent_id} {query}", 'wazuh-manager', host_manager)
+
+ assert result == '[]'
 
  finally:
  host_manager.run_command('wazuh-agent1', f'rm -rf {folder_path}')