refactor(#3142): collection of errors and some fixes.

wazuh · Aug 19, 2022 · 0d81f1b · 0d81f1b
1 parent e6d11cd
commit 0d81f1b
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 8 deletions.
diff --git a/tests/end_to_end/conftest.py b/tests/end_to_end/conftest.py
@@ -91,8 +91,15 @@ def validate_environments(request):
     remove_file(general_playbook)
     # If the general validations have failed, then abort the execution finishing with an error. Else, continue.
     if general_validation_runner.status == 'failed':
+        # Collect inventory_hostnames with errors
+        hosts_with_errors = [key for key in general_validation_runner.stats['failures']]
+        # Collect list of errors
+        errors = []
+        errors.extend([general_validation_runner.get_fact_cache(host)['phase_results'] for host in hosts_with_errors])
+        errors = ''.join(errors)
+        # Raise the exception with errors details
         raise Exception(f"The general validations have failed. Please check that the environments meet the expected "
-                        'requirements.')
+                        f"requirements. Result:\n{errors}")
     # -------------------------------------------------- End of Step 3 -------------------------------------------------
 
     # ------------------------------------ Step 4: Execute test-specific validations -----------------------------------

diff --git a/tests/end_to_end/data/env_requirements.json b/tests/end_to_end/data/env_requirements.json
@@ -23,7 +23,21 @@
             "distros": []
         }
     },
-    "test_brute_force": {
+    "test_brute_force_ssh": {
+        "manager": {
+            "instances": 1,
+            "distros": [
+                "CentOS"
+            ]
+        },
+        "agent": {
+            "instances": 1,
+            "distros": [
+                "CentOS"
+            ]
+        }
+    },
+    "test_brute_force_rdp": {
         "manager": {
             "instances": 1,
             "distros": [
@@ -33,7 +47,6 @@
         "agent": {
             "instances": 2,
             "distros": [
-                "CentOS",
                 "Windows"
             ]
         }

diff --git a/tests/end_to_end/roles/host_checker/tasks/check_controller_indexer.yaml b/tests/end_to_end/roles/host_checker/tasks/check_controller_indexer.yaml
@@ -15,11 +15,6 @@
   delegate_to: localhost
   when: (os == 'Linux' and 'server' in wazuh_info.stdout)
 
-- debug: var=test_result
-  when: test_result is failed
-
-- debug: var=test_result.stderr
-
 - name: Check the connection between Controller node and Wazuh Indexer
   set_fact:
     check_result: 'true'

diff --git a/tests/end_to_end/roles/host_checker/tasks/main.yaml b/tests/end_to_end/roles/host_checker/tasks/main.yaml
@@ -23,6 +23,10 @@
 # ----------------------------------------------------------------------------
 
 # -------- Task to identify whether the validation step fails or not. --------
+- set_fact:
+    phase_results: "{{ errors }}"
+    cacheable: yes
+
 - name: Verify if any check have failed
   fail:
     msg: "Some validations were fail:\n'{{ errors }}'"