fix(#3278): fixes after second review

wazuh · Aug 3, 2023 · f9696f5 · f9696f5
1 parent 0bc31b5
commit f9696f5
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,8 +9,6 @@ Release report: TBD
 
 ### Added
 
-- Update schema database version ([#4128](https://github.com/wazuh/wazuh-qa/pull/4128)) \- (Tests)
-- Add  IT tests FIM registry monitoring using wildcards. ([#4220](https://github.com/wazuh/wazuh-qa/pull/4220)) \- (Framework + Tests)
 - New 'SCA' test suite and framework. ([#3566](https://github.com/wazuh/wazuh-qa/pull/3566)) \- (Framework + Tests)
 - Add tests for merged.mg file generation. ([#3278](https://github.com/wazuh/wazuh-qa/pull/4129)) \- (Tests)
 - Add integration tests for AWS module. ([#3911](https://github.com/wazuh/wazuh-qa/pull/3911)) \- (Framework + Tests + Documentation)

diff --git a/tests/system/README.md b/tests/system/README.md
@@ -121,6 +121,7 @@ required an specific testing environment located in `wazuh-qa/tests/system/provi
 | test_jwt_invalidation                                                     | agentless_cluster              |
 | test_active_response_log_format                                           | manager_agent                  |
 | test_fim/test_synchronization                                             | one_manager_agent              |
+| test_cluster/test_correct_merged_file_generation                          | one_manager_agent              |
 | test_multigroups/test_multigroups                                         | basic_cluster                  |
 | test_cluster/test_agent_groups/test_agent_groups_forced_change            | basic_cluster                  |
 | test_cluster/test_agent_groups/test_agent_default_group_added             | enrollment_cluster             |

diff --git a/tests/system/test_cluster/test_correct_merged_file_generation/data/messages.yaml b/tests/system/test_cluster/test_correct_merged_file_generation/data/messages.yaml
@@ -1,4 +1,4 @@
 wazuh-master:
-  - regex: .*etc/shared/'FOLDER'/'EmptyFile00000'.txt' is empty
+  - regex: .*etc/shared/FOLDER/FILENAME.txt' is empty
     path: /var/ossec/logs/ossec.log
     time:out: 30
diff --git a/...m/test_cluster/test_correct_merged_file_generation/test_correct_merged_file_generation.py b/...m/test_cluster/test_correct_merged_file_generation/test_correct_merged_file_generation.py
@@ -137,9 +137,6 @@ def test_correct_merged_file_generation(test_case, environment_setting):
     else:
         time.sleep(T_10)
 
-    assert 'merged.mg' in host_manager.run_command(testinfra_hosts[0],
-                                                   f"ls {WAZUH_PATH}/etc/shared/{folder} -la | grep merged")
-
     # Check number of files
 
     if file_name is not None: