Merge pull request #1929 from wazuh/fix_test_ignore_valid_timeout

Fix test_ignore_valid.py - Add timeout variable
wazuh · Sep 30, 2021 · 0d09877 · 0d09877
2 parents 33af92b + be8aada
commit 0d09877
Show file tree

Hide file tree

Showing 3 changed files with 235 additions and 2 deletions.
diff --git a/tests/integration/test_fim/test_files/test_ignore/data/wazuh_conf_win32.yaml b/tests/integration/test_fim/test_files/test_ignore/data/wazuh_conf_win32.yaml
@@ -19,13 +19,49 @@
         attributes:
         - check_all: 'yes'
         - FIM_MODE
+  - section: sca
+    elements:
+    - enabled:
+        value: 'no'
+  - section: rootcheck
+    elements:
+    - disabled:
+        value: 'yes'
+  - section: active-response
+    elements:
+    - disabled:
+        value: 'yes'
+  - section: wodle
+    attributes:
+      - name: 'syscollector'
+    elements:
+      - disabled:
+          value: 'yes'
 # conf 2
 - tags:
   - valid_no_regex
   - valid_no_regex1
   apply_to_modules:
   - test_ignore_valid
   sections:
+  - section: sca
+    elements:
+    - enabled:
+        value: 'no'
+  - section: rootcheck
+    elements:
+    - disabled:
+        value: 'yes'
+  - section: active-response
+    elements:
+    - disabled:
+        value: 'yes'
+  - section: wodle
+    attributes:
+      - name: 'syscollector'
+    elements:
+      - disabled:
+          value: 'yes'
   - section: syscheck
     elements:
     - disabled:
@@ -44,6 +80,24 @@
   apply_to_modules:
   - test_ignore_valid
   sections:
+  - section: sca
+    elements:
+    - enabled:
+        value: 'no'
+  - section: rootcheck
+    elements:
+    - disabled:
+        value: 'yes'
+  - section: active-response
+    elements:
+    - disabled:
+        value: 'yes'
+  - section: wodle
+    attributes:
+      - name: 'syscollector'
+    elements:
+      - disabled:
+          value: 'yes'
   - section: syscheck
     elements:
     - disabled:
@@ -62,6 +116,24 @@
   apply_to_modules:
   - test_ignore_valid
   sections:
+  - section: sca
+    elements:
+    - enabled:
+        value: 'no'
+  - section: rootcheck
+    elements:
+    - disabled:
+        value: 'yes'
+  - section: active-response
+    elements:
+    - disabled:
+        value: 'yes'
+  - section: wodle
+    attributes:
+      - name: 'syscollector'
+    elements:
+      - disabled:
+          value: 'yes'
   - section: syscheck
     elements:
     - disabled:
@@ -82,6 +154,24 @@
   apply_to_modules:
   - test_ignore_valid
   sections:
+  - section: sca
+    elements:
+    - enabled:
+        value: 'no'
+  - section: rootcheck
+    elements:
+    - disabled:
+        value: 'yes'
+  - section: active-response
+    elements:
+    - disabled:
+        value: 'yes'
+  - section: wodle
+    attributes:
+      - name: 'syscollector'
+    elements:
+      - disabled:
+          value: 'yes'
   - section: syscheck
     elements:
     - disabled:
@@ -102,6 +192,24 @@
   apply_to_modules:
   - test_ignore_valid
   sections:
+  - section: sca
+    elements:
+    - enabled:
+        value: 'no'
+  - section: rootcheck
+    elements:
+    - disabled:
+        value: 'yes'
+  - section: active-response
+    elements:
+    - disabled:
+        value: 'yes'
+  - section: wodle
+    attributes:
+      - name: 'syscollector'
+    elements:
+      - disabled:
+          value: 'yes'
   - section: syscheck
     elements:
     - disabled:
@@ -122,6 +230,24 @@
   apply_to_modules:
   - test_ignore_valid
   sections:
+  - section: sca
+    elements:
+    - enabled:
+        value: 'no'
+  - section: rootcheck
+    elements:
+    - disabled:
+        value: 'yes'
+  - section: active-response
+    elements:
+    - disabled:
+        value: 'yes'
+  - section: wodle
+    attributes:
+      - name: 'syscollector'
+    elements:
+      - disabled:
+          value: 'yes'
   - section: syscheck
     elements:
     - disabled:
@@ -146,6 +272,24 @@
   apply_to_modules:
   - test_ignore_valid
   sections:
+  - section: sca
+    elements:
+    - enabled:
+        value: 'no'
+  - section: rootcheck
+    elements:
+    - disabled:
+        value: 'yes'
+  - section: active-response
+    elements:
+    - disabled:
+        value: 'yes'
+  - section: wodle
+    attributes:
+      - name: 'syscollector'
+    elements:
+      - disabled:
+          value: 'yes'
   - section: syscheck
     elements:
     - disabled:
@@ -166,6 +310,24 @@
   apply_to_modules:
   - test_ignore_valid
   sections:
+  - section: sca
+    elements:
+    - enabled:
+        value: 'no'
+  - section: rootcheck
+    elements:
+    - disabled:
+        value: 'yes'
+  - section: active-response
+    elements:
+    - disabled:
+        value: 'yes'
+  - section: wodle
+    attributes:
+      - name: 'syscollector'
+    elements:
+      - disabled:
+          value: 'yes'
   - section: syscheck
     elements:
     - disabled:
@@ -185,6 +347,24 @@
   apply_to_modules:
   - test_ignore_valid
   sections:
+  - section: sca
+    elements:
+    - enabled:
+        value: 'no'
+  - section: rootcheck
+    elements:
+    - disabled:
+        value: 'yes'
+  - section: active-response
+    elements:
+    - disabled:
+        value: 'yes'
+  - section: wodle
+    attributes:
+      - name: 'syscollector'
+    elements:
+      - disabled:
+          value: 'yes'
   - section: syscheck
     elements:
     - disabled:
@@ -204,6 +384,24 @@
   apply_to_modules:
   - test_ignore_valid
   sections:
+  - section: sca
+    elements:
+    - enabled:
+        value: 'no'
+  - section: rootcheck
+    elements:
+    - disabled:
+        value: 'yes'
+  - section: active-response
+    elements:
+    - disabled:
+        value: 'yes'
+  - section: wodle
+    attributes:
+      - name: 'syscollector'
+    elements:
+      - disabled:
+          value: 'yes'
   - section: syscheck
     elements:
     - disabled:

diff --git a/tests/integration/test_fim/test_files/test_ignore/data/wazuh_conf_win32_ignore_registry.yaml b/tests/integration/test_fim/test_files/test_ignore/data/wazuh_conf_win32_ignore_registry.yaml
@@ -5,6 +5,24 @@
   apply_to_modules:
   - test_ignore_registry
   sections:
+  - section: sca
+    elements:
+    - enabled:
+        value: 'no'
+  - section: rootcheck
+    elements:
+    - disabled:
+        value: 'yes'
+  - section: active-response
+    elements:
+    - disabled:
+        value: 'yes'
+  - section: wodle
+    attributes:
+      - name: 'syscollector'
+    elements:
+      - disabled:
+          value: 'yes'
   - section: syscheck
     elements:
     - disabled:
@@ -41,6 +59,24 @@
   apply_to_modules:
   - test_ignore_registry
   sections:
+  - section: sca
+    elements:
+    - enabled:
+        value: 'no'
+  - section: rootcheck
+    elements:
+    - disabled:
+        value: 'yes'
+  - section: active-response
+    elements:
+    - disabled:
+        value: 'yes'
+  - section: wodle
+    attributes:
+      - name: 'syscollector'
+    elements:
+      - disabled:
+          value: 'yes'
   - section: syscheck
     elements:
     - disabled:
@@ -73,4 +109,4 @@
     - windows_registry:
         value: "HKEY_LOCAL_MACHINE\\SOFTWARE\\test2"
         attributes:
-        - arch: 'both'
+        - arch: 'both'
diff --git a/tests/integration/test_fim/test_files/test_ignore/test_ignore_valid.py b/tests/integration/test_fim/test_files/test_ignore/test_ignore_valid.py
@@ -18,7 +18,6 @@
 pytestmark = pytest.mark.tier(level=2)
 
 # variables
-
 test_data_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'data')
 configurations_path = os.path.join(test_data_path,
                                    'wazuh_conf_win32.yaml' if sys.platform == 'win32' else 'wazuh_conf.yaml')