From 81e792be9936b2842aa439bf5d42b31348b119bc Mon Sep 17 00:00:00 2001 From: Katarzyna Treder Date: Tue, 10 Dec 2024 12:20:31 +0100 Subject: [PATCH] Move Time to types Signed-off-by: Katarzyna Treder --- test/functional/api/cas/cache_config.py | 2 +- test/functional/test-framework | 2 +- test/functional/tests/incremental_load/test_incremental_load.py | 2 +- test/functional/tests/lazy_writes/cleaning_policy/test_acp.py | 2 +- test/functional/tests/lazy_writes/cleaning_policy/test_alru.py | 2 +- .../tests/lazy_writes/cleaning_policy/test_cleaning_params.py | 2 +- .../tests/lazy_writes/recovery/test_recovery_all_options.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/functional/api/cas/cache_config.py b/test/functional/api/cas/cache_config.py index b57757f..dcd04c5 100644 --- a/test/functional/api/cas/cache_config.py +++ b/test/functional/api/cas/cache_config.py @@ -8,7 +8,7 @@ from enum import Enum, IntFlag from test_utils.os_utils import get_kernel_module_parameter from types.size import Size, Unit -from test_utils.time import Time +from types.time import Time class CacheLineSize(Enum): diff --git a/test/functional/test-framework b/test/functional/test-framework index 622c64c..513f006 160000 --- a/test/functional/test-framework +++ b/test/functional/test-framework @@ -1 +1 @@ -Subproject commit 622c64c46bb36cfe72001264e9f6d95c8b1c006b +Subproject commit 513f006d17468ead7a768e13f48014e725b9ddd1 diff --git a/test/functional/tests/incremental_load/test_incremental_load.py b/test/functional/tests/incremental_load/test_incremental_load.py index ba30a35..b3a041a 100644 --- a/test/functional/tests/incremental_load/test_incremental_load.py +++ b/test/functional/tests/incremental_load/test_incremental_load.py @@ -32,7 +32,7 @@ from test_utils.filesystem.file import File from test_utils.os_utils import Udev, sync from test_utils.output import CmdException from types.size import Size, Unit -from test_utils.time import Time +from types.time import Time @pytest.mark.CI diff --git a/test/functional/tests/lazy_writes/cleaning_policy/test_acp.py b/test/functional/tests/lazy_writes/cleaning_policy/test_acp.py index c3158bf..6faacd5 100644 --- a/test/functional/tests/lazy_writes/cleaning_policy/test_acp.py +++ b/test/functional/tests/lazy_writes/cleaning_policy/test_acp.py @@ -26,7 +26,7 @@ from test_tools.fio.fio import Fio from test_tools.fio.fio_param import IoEngine, ReadWrite from test_utils.os_utils import kill_all_io from types.size import Size, Unit -from test_utils.time import Time +from types.time import Time @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand])) diff --git a/test/functional/tests/lazy_writes/cleaning_policy/test_alru.py b/test/functional/tests/lazy_writes/cleaning_policy/test_alru.py index 450be7a..f53f503 100644 --- a/test/functional/tests/lazy_writes/cleaning_policy/test_alru.py +++ b/test/functional/tests/lazy_writes/cleaning_policy/test_alru.py @@ -16,7 +16,7 @@ from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine from test_utils.os_utils import Udev, kill_all_io from types.size import Size, Unit -from test_utils.time import Time +from types.time import Time @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand])) diff --git a/test/functional/tests/lazy_writes/cleaning_policy/test_cleaning_params.py b/test/functional/tests/lazy_writes/cleaning_policy/test_cleaning_params.py index 8a27da4..962e239 100644 --- a/test/functional/tests/lazy_writes/cleaning_policy/test_cleaning_params.py +++ b/test/functional/tests/lazy_writes/cleaning_policy/test_cleaning_params.py @@ -20,7 +20,7 @@ from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.dd import Dd from test_utils.os_utils import Udev from types.size import Size, Unit -from test_utils.time import Time +from types.time import Time @pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand])) diff --git a/test/functional/tests/lazy_writes/recovery/test_recovery_all_options.py b/test/functional/tests/lazy_writes/recovery/test_recovery_all_options.py index 2de7c74..e04cedc 100644 --- a/test/functional/tests/lazy_writes/recovery/test_recovery_all_options.py +++ b/test/functional/tests/lazy_writes/recovery/test_recovery_all_options.py @@ -19,7 +19,7 @@ from test_utils import os_utils from test_utils.filesystem.file import File from test_utils.os_utils import DropCachesMode from types.size import Size, Unit -from test_utils.time import Time +from types.time import Time from tests.lazy_writes.recovery.recovery_tests_methods import power_cycle_dut test_file_size = Size(300, Unit.MebiByte)