refac: Update xfail for bionic test download feed

wazuh · May 30, 2022 · d170c61 · d170c61
1 parent 70109ae
commit d170c61
Showing 1 changed file with 20 additions and 23 deletions.
diff --git a/tests/integration/test_vulnerability_detector/test_feeds/test_download_feeds.py b/tests/integration/test_vulnerability_detector/test_feeds/test_download_feeds.py
@@ -121,26 +121,23 @@ def test_download_feeds(configuration, metadata, set_wazuh_configuration_vdt, tr
         - r'Starting .* database update'
         - r'The update of the .* feed finished successfully'
     '''
-    try:
-        # Check that the feed update has started
-        evm.check_provider_database_update_start_log(metadata['provider_name'])
-        # Check that the feed has been updated successfully
-        evm.check_provider_database_update_finish_log(provider_name=metadata['provider_name'],
-                                                      timeout=metadata['download_timeout'])
-
-        if 'provider_json_name' in metadata:
-            evm.check_provider_database_update_start_log(metadata['provider_json_name'])
-            evm.check_provider_database_update_finish_log(provider_name=metadata['provider_json_name'],
-                                                          timeout=metadata['download_timeout'])
-
-        # Check that the timestamp of the feed metadata does not exceed the established threshold limit.
-        if metadata['update_treshold_weeks'] != 'None':
-            assert vd.feed_is_recently_updated(provider_name=metadata['provider_name'],
-                                               provider_os=metadata['provider_os'],
-                                               threshold_weeks=metadata['update_treshold_weeks']), '' \
-                                               f"The {metadata['provider_os']} feed has not been recently updated"
-    except TimeoutError as e:
-        if metadata['provider_os'] == 'BIONIC':
-            pytest.xfail(reason='Ubuntu Bionic feed parsing error - Wazuh/Wazuh Issue #13556')
-        else:
-            pytest.fail()
+    if metadata['provider_os'] == 'BIONIC':
+        pytest.xfail(reason='Ubuntu Bionic feed parsing error - Wazuh/Wazuh Issue #13556')
+
+    # Check that the feed update has started
+    evm.check_provider_database_update_start_log(metadata['provider_name'])
+    # Check that the feed has been updated successfully
+    evm.check_provider_database_update_finish_log(provider_name=metadata['provider_name'],
+                                                    timeout=metadata['download_timeout'])
+
+    if 'provider_json_name' in metadata:
+        evm.check_provider_database_update_start_log(metadata['provider_json_name'])
+        evm.check_provider_database_update_finish_log(provider_name=metadata['provider_json_name'],
+                                                        timeout=metadata['download_timeout'])
+
+    # Check that the timestamp of the feed metadata does not exceed the established threshold limit.
+    if metadata['update_treshold_weeks'] != 'None':
+        assert vd.feed_is_recently_updated(provider_name=metadata['provider_name'],
+                                           provider_os=metadata['provider_os'],
+                                           threshold_weeks=metadata['update_treshold_weeks']), '' \
+                                           f"The {metadata['provider_os']} feed has not been recently updated"