From 786117f03d263a845a6318e3b2d412ee002826db Mon Sep 17 00:00:00 2001 From: camila Date: Fri, 20 May 2022 14:18:25 -0300 Subject: [PATCH 1/4] add: Add skip for windows --- .../test_logcollector/test_age/test_age_datetime_changed.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/integration/test_logcollector/test_age/test_age_datetime_changed.py b/tests/integration/test_logcollector/test_age/test_age_datetime_changed.py index ccd3b4e693..8ae548b185 100644 --- a/tests/integration/test_logcollector/test_age/test_age_datetime_changed.py +++ b/tests/integration/test_logcollector/test_age/test_age_datetime_changed.py @@ -58,6 +58,7 @@ - logcollector_age ''' import os +import sys import time import tempfile from datetime import datetime @@ -135,6 +136,7 @@ def restart_logcollector_function(): @pytest.mark.parametrize('new_datetime', new_host_datetime) +@pytest.mark.skipif(sys.platform == 'win32', reason='It will be blocked by https://github.com/wazuh/wazuh-qa/issues/2174.') def test_configuration_age_datetime(get_configuration, configure_environment, configure_local_internal_options_module, restart_monitord, restart_logcollector_function, file_monitoring, new_datetime, get_files_list, create_file_structure_function): From 7119717b062f3566211564beb48329442c82a767 Mon Sep 17 00:00:00 2001 From: Deblintrake09 Date: Mon, 30 May 2022 12:27:51 +0000 Subject: [PATCH 2/4] fix: add xfail to BIONIC test_download_feeds --- .../test_feeds/test_download_feeds.py | 35 +++++++++++-------- 1 file changed, 21 insertions(+), 14 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 index 343161ca42..09de035f67 100644 --- 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,19 +121,26 @@ def test_download_feeds(configuration, metadata, set_wazuh_configuration_vdt, tr - r'Starting .* database update' - r'The update of the .* feed finished successfully' ''' - # 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'], + 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']) - # Check that the timestamp of the feed metadata does not exceed the established threshold limit. - 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" + 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() From 70109aefc1b35b52ed97a292188f93165c334204 Mon Sep 17 00:00:00 2001 From: Deblintrake09 Date: Mon, 30 May 2022 13:09:04 +0000 Subject: [PATCH 3/4] fix: test_download_feeds indentation error --- .../test_feeds/test_download_feeds.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 09de035f67..37684c2ff9 100644 --- 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,7 +121,7 @@ def test_download_feeds(configuration, metadata, set_wazuh_configuration_vdt, tr - r'Starting .* database update' - r'The update of the .* feed finished successfully' ''' - try: + 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 From d170c61fda182c6c67612af0053b9d409c5fd8df Mon Sep 17 00:00:00 2001 From: jmv74211 Date: Mon, 30 May 2022 17:05:52 +0200 Subject: [PATCH 4/4] refac: Update xfail for bionic test download feed --- .../test_feeds/test_download_feeds.py | 43 +++++++++---------- 1 file changed, 20 insertions(+), 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 index 37684c2ff9..92d268149f 100644 --- 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"