From 6f89df367834b9554c873a92565b49bab75ffbf7 Mon Sep 17 00:00:00 2001 From: Miauwkeru Date: Thu, 26 Oct 2023 15:29:58 +0000 Subject: [PATCH] Remove skips for timezone tests (DIS-2425) --- tests/test_plugins_os_unix_log_auth.py | 6 ------ tests/test_plugins_os_unix_log_messages.py | 5 ----- 2 files changed, 11 deletions(-) diff --git a/tests/test_plugins_os_unix_log_auth.py b/tests/test_plugins_os_unix_log_auth.py index 250c71895..016888253 100644 --- a/tests/test_plugins_os_unix_log_auth.py +++ b/tests/test_plugins_os_unix_log_auth.py @@ -1,10 +1,8 @@ -import platform from datetime import datetime, timezone from io import BytesIO from unittest.mock import patch from zoneinfo import ZoneInfo -import pytest from flow.record.fieldtypes import datetime as dt from dissect.target.filesystem import VirtualFilesystem @@ -13,7 +11,6 @@ from ._utils import absolute_path -@pytest.mark.skipif(platform.system() == "Windows", reason="ZoneInfoNotFoundError. Needs to be fixed.") def test_auth_plugin(target_unix, fs_unix: VirtualFilesystem): fs_unix.map_file_fh("/etc/timezone", BytesIO("Europe/Amsterdam".encode())) @@ -35,7 +32,6 @@ def test_auth_plugin(target_unix, fs_unix: VirtualFilesystem): assert results[-1].message == "CRON[1]: pam_unix(cron:session): session opened for user root by (uid=0)" -@pytest.mark.skipif(platform.system() == "Windows", reason="ZoneInfoNotFoundError. Needs to be fixed.") def test_auth_plugin_with_gz(target_unix, fs_unix: VirtualFilesystem): fs_unix.map_file_fh("/etc/timezone", BytesIO("Pacific/Honolulu".encode())) @@ -60,7 +56,6 @@ def test_auth_plugin_with_gz(target_unix, fs_unix: VirtualFilesystem): assert results[-1].message == "CRON[1]: pam_unix(cron:session): session opened for user root by (uid=0)" -@pytest.mark.skipif(platform.system() == "Windows", reason="ZoneInfoNotFoundError. Needs to be fixed.") def test_auth_plugin_with_bz(target_unix, fs_unix: VirtualFilesystem): fs_unix.map_file_fh("/etc/timezone", BytesIO("America/Nuuk".encode())) @@ -85,7 +80,6 @@ def test_auth_plugin_with_bz(target_unix, fs_unix: VirtualFilesystem): assert results[-1].message == "CRON[1]: pam_unix(cron:session): session opened for user root by (uid=0)" -@pytest.mark.skipif(platform.system() == "Windows", reason="ZoneInfoNotFoundError. Needs to be fixed.") def test_auth_plugin_year_rollover(target_unix, fs_unix: VirtualFilesystem): fs_unix.map_file_fh("/etc/timezone", BytesIO("Etc/UTC".encode())) diff --git a/tests/test_plugins_os_unix_log_messages.py b/tests/test_plugins_os_unix_log_messages.py index 361156610..bdda84c19 100644 --- a/tests/test_plugins_os_unix_log_messages.py +++ b/tests/test_plugins_os_unix_log_messages.py @@ -1,4 +1,3 @@ -import platform import tarfile import textwrap from datetime import datetime, timezone @@ -6,7 +5,6 @@ from unittest.mock import patch from zoneinfo import ZoneInfo -import pytest from flow.record.fieldtypes import datetime as dt from flow.record.fieldtypes import path @@ -18,7 +16,6 @@ from ._utils import absolute_path -@pytest.mark.skipif(platform.system() == "Windows", reason="ZoneInfoNotFoundError. Needs to be fixed.") def test_unix_log_messages_plugin(target_unix_users, fs_unix): fs_unix.map_file_fh("/etc/timezone", BytesIO(b"Europe/Amsterdam")) @@ -51,7 +48,6 @@ def test_unix_log_messages_plugin(target_unix_users, fs_unix): assert isinstance(syslogs[0], type(MessagesRecord())) -@pytest.mark.skipif(platform.system() == "Windows", reason="ZoneInfoNotFoundError. Needs to be fixed.") def test_unix_log_messages_compressed_timezone_year_rollover(): target = Target() bio = BytesIO() @@ -90,7 +86,6 @@ def test_unix_log_messages_compressed_timezone_year_rollover(): assert results[1].ts == dt(2021, 1, 1, 13, 37, 0, tzinfo=ZoneInfo("America/Chicago")) -@pytest.mark.skipif(platform.system() == "Windows", reason="ZoneInfoNotFoundError. Needs to be fixed.") def test_unix_log_messages_malformed_log_year_rollover(target_unix_users, fs_unix): fs_unix.map_file_fh("/etc/timezone", BytesIO(b"Europe/Amsterdam"))