From 9460151ee532019f331186c1dcbbb23bfb719d53 Mon Sep 17 00:00:00 2001 From: Katarzyna Treder Date: Tue, 10 Dec 2024 12:31:14 +0100 Subject: [PATCH] Move output to connection utils Signed-off-by: Katarzyna Treder --- test/functional/api/cas/cache.py | 2 +- test/functional/api/cas/casadm.py | 2 +- test/functional/api/cas/casadm_parser.py | 2 +- test/functional/api/cas/cli_messages.py | 2 +- test/functional/api/cas/installer.py | 2 +- test/functional/api/cas/version.py | 2 +- test/functional/test-framework | 2 +- test/functional/tests/basic/test_basic.py | 2 +- test/functional/tests/cache_ops/test_concurrent_flushes.py | 2 +- test/functional/tests/cache_ops/test_core_remove.py | 2 +- test/functional/tests/cache_ops/test_multistream_seq_cutoff.py | 2 +- test/functional/tests/cli/test_cli_standby.py | 2 +- test/functional/tests/cli/test_zero_metadata_command.py | 2 +- .../tests/data_integrity/test_data_integrity_unplug.py | 2 +- .../functional/tests/fault_injection/test_fault_power_reboot.py | 2 +- .../tests/fault_injection/test_soft_hot_plug_device.py | 2 +- test/functional/tests/incremental_load/test_core_pool.py | 2 +- test/functional/tests/incremental_load/test_incremental_load.py | 2 +- .../tests/io_class/test_io_class_prevent_wrong_configuration.py | 2 +- .../tests/lazy_writes/recovery/test_recovery_flush_reset.py | 2 +- .../tests/lazy_writes/recovery/test_recovery_unplug.py | 2 +- .../functional/tests/lazy_writes/test_parallel_core_flushing.py | 2 +- test/functional/tests/misc/test_device_capabilities.py | 2 +- test/functional/tests/performance/test_100p_hits.py | 2 +- test/functional/tests/security/test_load_corrupted_metadata.py | 2 +- test/functional/tests/security/test_security_user.py | 2 +- test/functional/tests/stats/test_ioclass_stats.py | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/test/functional/api/cas/cache.py b/test/functional/api/cas/cache.py index e752a0f..fe1e667 100644 --- a/test/functional/api/cas/cache.py +++ b/test/functional/api/cas/cache.py @@ -9,7 +9,7 @@ from api.cas.core import Core from api.cas.dmesg import get_metadata_size_on_device from api.cas.statistics import CacheStats, CacheIoClassStats from test_utils.os_utils import * -from test_utils.output import Output +from connection.utils.output import Output class Cache: diff --git a/test/functional/api/cas/casadm.py b/test/functional/api/cas/casadm.py index fdc64ed..f1270b8 100644 --- a/test/functional/api/cas/casadm.py +++ b/test/functional/api/cas/casadm.py @@ -21,7 +21,7 @@ from api.cas.core import Core from core.test_run import TestRun from storage_devices.device import Device from test_utils.os_utils import reload_kernel_module -from test_utils.output import CmdException, Output +from connection.utils.output import CmdException, Output from types.size import Size, Unit diff --git a/test/functional/api/cas/casadm_parser.py b/test/functional/api/cas/casadm_parser.py index 1285d99..da3090a 100644 --- a/test/functional/api/cas/casadm_parser.py +++ b/test/functional/api/cas/casadm_parser.py @@ -18,7 +18,7 @@ from api.cas.ioclass_config import IoClass from api.cas.version import CasVersion from core.test_run_utils import TestRun from storage_devices.device import Device -from test_utils.output import CmdException +from connection.utils.output import CmdException class Stats(dict): diff --git a/test/functional/api/cas/cli_messages.py b/test/functional/api/cas/cli_messages.py index fc3104b..78da17b 100644 --- a/test/functional/api/cas/cli_messages.py +++ b/test/functional/api/cas/cli_messages.py @@ -7,7 +7,7 @@ import re from core.test_run import TestRun -from test_utils.output import Output +from connection.utils.output import Output load_inactive_core_missing = [ r"WARNING: Can not resolve path to core \d+ from cache \d+\. By-id path will be shown for that " diff --git a/test/functional/api/cas/installer.py b/test/functional/api/cas/installer.py index abf06d0..4861286 100644 --- a/test/functional/api/cas/installer.py +++ b/test/functional/api/cas/installer.py @@ -10,7 +10,7 @@ from core.test_run import TestRun from api.cas import cas_module from api.cas.version import get_installed_cas_version from test_utils import os_utils, git -from test_utils.output import CmdException +from connection.utils.output import CmdException def rsync_opencas_sources(): diff --git a/test/functional/api/cas/version.py b/test/functional/api/cas/version.py index 72129d6..1ce6583 100644 --- a/test/functional/api/cas/version.py +++ b/test/functional/api/cas/version.py @@ -8,7 +8,7 @@ import re from test_utils import git from core.test_run import TestRun -from test_utils.output import CmdException +from connection.utils.output import CmdException class CasVersion: diff --git a/test/functional/test-framework b/test/functional/test-framework index 513f006..161cc79 160000 --- a/test/functional/test-framework +++ b/test/functional/test-framework @@ -1 +1 @@ -Subproject commit 513f006d17468ead7a768e13f48014e725b9ddd1 +Subproject commit 161cc7957afb70256cf07a69673dad63889ccbfc diff --git a/test/functional/tests/basic/test_basic.py b/test/functional/tests/basic/test_basic.py index 7dba5ed..4a68996 100644 --- a/test/functional/tests/basic/test_basic.py +++ b/test/functional/tests/basic/test_basic.py @@ -21,7 +21,7 @@ from test_tools import fs_utils from test_tools.dd import Dd from test_tools.disk_utils import Filesystem from test_utils.filesystem.file import File -from test_utils.output import CmdException +from connection.utils.output import CmdException from types.size import Size, Unit version_file_path = r"/var/lib/opencas/cas_version" diff --git a/test/functional/tests/cache_ops/test_concurrent_flushes.py b/test/functional/tests/cache_ops/test_concurrent_flushes.py index 3dc950d..da777e1 100644 --- a/test/functional/tests/cache_ops/test_concurrent_flushes.py +++ b/test/functional/tests/cache_ops/test_concurrent_flushes.py @@ -15,7 +15,7 @@ from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.fio.fio import Fio from test_tools.fio.fio_param import IoEngine, ReadWrite -from test_utils.output import CmdException +from connection.utils.output import CmdException from types.size import Size, Unit diff --git a/test/functional/tests/cache_ops/test_core_remove.py b/test/functional/tests/cache_ops/test_core_remove.py index 41088b3..fdd4d1e 100644 --- a/test/functional/tests/cache_ops/test_core_remove.py +++ b/test/functional/tests/cache_ops/test_core_remove.py @@ -12,7 +12,7 @@ from api.cas import casadm from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeLowerThan, DiskTypeSet from test_tools.disk_utils import Filesystem -from test_utils.output import CmdException +from connection.utils.output import CmdException from types.size import Size, Unit mount_point = "/mnt/cas" diff --git a/test/functional/tests/cache_ops/test_multistream_seq_cutoff.py b/test/functional/tests/cache_ops/test_multistream_seq_cutoff.py index 1969c6e..0604981 100644 --- a/test/functional/tests/cache_ops/test_multistream_seq_cutoff.py +++ b/test/functional/tests/cache_ops/test_multistream_seq_cutoff.py @@ -25,7 +25,7 @@ from test_tools.disk_utils import Filesystem from test_tools.fio.fio import Fio from test_tools.fio.fio_param import IoEngine, ReadWrite from test_utils.os_utils import Udev -from test_utils.output import CmdException +from connection.utils.output import CmdException from types.size import Size, Unit random_thresholds = random.sample(range(1028, 1024**2, 4), 3) diff --git a/test/functional/tests/cli/test_cli_standby.py b/test/functional/tests/cli/test_cli_standby.py index afee549..800063b 100644 --- a/test/functional/tests/cli/test_cli_standby.py +++ b/test/functional/tests/cli/test_cli_standby.py @@ -16,7 +16,7 @@ from test_tools.dd import Dd from test_tools.disk_utils import Filesystem from test_utils.filesystem.file import File from test_utils.os_utils import sync -from test_utils.output import CmdException +from connection.utils.output import CmdException from types.size import Size, Unit from api.cas.cli_messages import ( check_stderr_msg, diff --git a/test/functional/tests/cli/test_zero_metadata_command.py b/test/functional/tests/cli/test_zero_metadata_command.py index 0907bcd..e33eee2 100644 --- a/test/functional/tests/cli/test_zero_metadata_command.py +++ b/test/functional/tests/cli/test_zero_metadata_command.py @@ -16,7 +16,7 @@ from test_tools.disk_utils import get_device_filesystem_type, Filesystem from test_tools.fio.fio import Fio from test_tools.fio.fio_param import IoEngine, ReadWrite from test_utils.disk_finder import get_system_disks -from test_utils.output import CmdException +from connection.utils.output import CmdException from types.size import Size, Unit diff --git a/test/functional/tests/data_integrity/test_data_integrity_unplug.py b/test/functional/tests/data_integrity/test_data_integrity_unplug.py index 646cef3..597a26b 100644 --- a/test/functional/tests/data_integrity/test_data_integrity_unplug.py +++ b/test/functional/tests/data_integrity/test_data_integrity_unplug.py @@ -21,7 +21,7 @@ from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite from test_utils.asynchronous import start_async_func from test_utils.filesystem.directory import Directory -from test_utils.output import CmdException +from connection.utils.output import CmdException from types.size import Unit, Size ram_disk, tmp_dir, fio_seed = None, None, None diff --git a/test/functional/tests/fault_injection/test_fault_power_reboot.py b/test/functional/tests/fault_injection/test_fault_power_reboot.py index a8a791b..25c7222 100644 --- a/test/functional/tests/fault_injection/test_fault_power_reboot.py +++ b/test/functional/tests/fault_injection/test_fault_power_reboot.py @@ -10,7 +10,7 @@ import pytest from api.cas import casadm, cli, cli_messages from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan -from test_utils.output import CmdException +from connection.utils.output import CmdException from types.size import Size, Unit log_path = "/var/log/opencas.log" diff --git a/test/functional/tests/fault_injection/test_soft_hot_plug_device.py b/test/functional/tests/fault_injection/test_soft_hot_plug_device.py index 9cc7d64..7bfc1d2 100644 --- a/test/functional/tests/fault_injection/test_soft_hot_plug_device.py +++ b/test/functional/tests/fault_injection/test_soft_hot_plug_device.py @@ -16,7 +16,7 @@ from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.fio.fio import Fio from test_tools.fio.fio_param import ReadWrite, IoEngine, ErrorFilter -from test_utils.output import CmdException +from connection.utils.output import CmdException from types.size import Size, Unit diff --git a/test/functional/tests/incremental_load/test_core_pool.py b/test/functional/tests/incremental_load/test_core_pool.py index 182c2de..1f3c8f7 100644 --- a/test/functional/tests/incremental_load/test_core_pool.py +++ b/test/functional/tests/incremental_load/test_core_pool.py @@ -10,7 +10,7 @@ from api.cas.core import CoreStatus from core.test_run import TestRun from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan from test_tools.disk_utils import Filesystem -from test_utils.output import CmdException +from connection.utils.output import CmdException from types.size import Size, Unit diff --git a/test/functional/tests/incremental_load/test_incremental_load.py b/test/functional/tests/incremental_load/test_incremental_load.py index b3a041a..a77b16c 100644 --- a/test/functional/tests/incremental_load/test_incremental_load.py +++ b/test/functional/tests/incremental_load/test_incremental_load.py @@ -30,7 +30,7 @@ from test_tools.fio.fio import Fio from test_tools.fio.fio_param import IoEngine, ReadWrite from test_utils.filesystem.file import File from test_utils.os_utils import Udev, sync -from test_utils.output import CmdException +from connection.utils.output import CmdException from types.size import Size, Unit from types.time import Time diff --git a/test/functional/tests/io_class/test_io_class_prevent_wrong_configuration.py b/test/functional/tests/io_class/test_io_class_prevent_wrong_configuration.py index 6cd9072..060f79a 100644 --- a/test/functional/tests/io_class/test_io_class_prevent_wrong_configuration.py +++ b/test/functional/tests/io_class/test_io_class_prevent_wrong_configuration.py @@ -10,7 +10,7 @@ from api.cas.ioclass_config import IoClass from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools import fs_utils -from test_utils.output import CmdException +from connection.utils.output import CmdException from types.size import Unit, Size from tests.io_class.io_class_common import prepare, ioclass_config_path diff --git a/test/functional/tests/lazy_writes/recovery/test_recovery_flush_reset.py b/test/functional/tests/lazy_writes/recovery/test_recovery_flush_reset.py index 664cffb..a348140 100644 --- a/test/functional/tests/lazy_writes/recovery/test_recovery_flush_reset.py +++ b/test/functional/tests/lazy_writes/recovery/test_recovery_flush_reset.py @@ -15,7 +15,7 @@ from test_tools.disk_utils import Filesystem from test_tools.fs_utils import readlink from test_utils import os_utils from test_utils.os_utils import Udev, DropCachesMode -from test_utils.output import CmdException +from connection.utils.output import CmdException from types.size import Size, Unit from tests.lazy_writes.recovery.recovery_tests_methods import create_test_files, copy_file, \ compare_files, power_cycle_dut diff --git a/test/functional/tests/lazy_writes/recovery/test_recovery_unplug.py b/test/functional/tests/lazy_writes/recovery/test_recovery_unplug.py index 1f0a7a5..db76560 100644 --- a/test/functional/tests/lazy_writes/recovery/test_recovery_unplug.py +++ b/test/functional/tests/lazy_writes/recovery/test_recovery_unplug.py @@ -13,7 +13,7 @@ from api.cas.cache_config import CacheMode, CacheModeTrait, CacheLineSize from core.test_run import TestRun from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan from test_tools.disk_utils import Filesystem -from test_utils.output import CmdException +from connection.utils.output import CmdException from types.size import Size, Unit from tests.lazy_writes.recovery.recovery_tests_methods import create_test_files, copy_file, \ compare_files diff --git a/test/functional/tests/lazy_writes/test_parallel_core_flushing.py b/test/functional/tests/lazy_writes/test_parallel_core_flushing.py index b31aa87..2857cf5 100644 --- a/test/functional/tests/lazy_writes/test_parallel_core_flushing.py +++ b/test/functional/tests/lazy_writes/test_parallel_core_flushing.py @@ -14,7 +14,7 @@ from core.test_run_utils import TestRun from storage_devices.disk import DiskTypeSet, DiskType, DiskTypeLowerThan from test_tools.dd import Dd from test_utils.filesystem.file import File -from test_utils.output import CmdException +from connection.utils.output import CmdException from types.size import Size, Unit diff --git a/test/functional/tests/misc/test_device_capabilities.py b/test/functional/tests/misc/test_device_capabilities.py index 98d3249..dc7f136 100644 --- a/test/functional/tests/misc/test_device_capabilities.py +++ b/test/functional/tests/misc/test_device_capabilities.py @@ -14,7 +14,7 @@ from core.test_run import TestRun from storage_devices.device import Device from storage_devices.disk import DiskTypeSet, DiskType from test_tools import disk_utils -from test_utils.output import CmdException +from connection.utils.output import CmdException from types.size import Size, Unit diff --git a/test/functional/tests/performance/test_100p_hits.py b/test/functional/tests/performance/test_100p_hits.py index 344b447..848f43d 100644 --- a/test/functional/tests/performance/test_100p_hits.py +++ b/test/functional/tests/performance/test_100p_hits.py @@ -18,7 +18,7 @@ from storage_devices.disk import DiskTypeSet, DiskTypeLowerThan, DiskType from test_tools.fio.fio import Fio from test_tools.fio.fio_param import IoEngine, ReadWrite from test_utils.os_utils import Udev, set_wbt_lat, get_dut_cpu_physical_cores -from test_utils.output import CmdException +from connection.utils.output import CmdException from types.size import Size, Unit from utils.performance import WorkloadParameter diff --git a/test/functional/tests/security/test_load_corrupted_metadata.py b/test/functional/tests/security/test_load_corrupted_metadata.py index bda46ff..e6fa727 100644 --- a/test/functional/tests/security/test_load_corrupted_metadata.py +++ b/test/functional/tests/security/test_load_corrupted_metadata.py @@ -19,7 +19,7 @@ from storage_devices.device import Device from core.test_run import TestRun from storage_devices.ramdisk import RamDisk from test_tools.dd import Dd -from test_utils.output import CmdException +from connection.utils.output import CmdException from types.size import Size, Unit diff --git a/test/functional/tests/security/test_security_user.py b/test/functional/tests/security/test_security_user.py index 53baa11..d85a16a 100644 --- a/test/functional/tests/security/test_security_user.py +++ b/test/functional/tests/security/test_security_user.py @@ -15,7 +15,7 @@ from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools import fs_utils from test_tools.disk_utils import Filesystem from test_utils.os_utils import create_user, check_if_user_exists -from test_utils.output import CmdException +from connection.utils.output import CmdException from types.size import Size, Unit mount_point = "/mnt/cas" diff --git a/test/functional/tests/stats/test_ioclass_stats.py b/test/functional/tests/stats/test_ioclass_stats.py index 287c6e7..b4fb11a 100644 --- a/test/functional/tests/stats/test_ioclass_stats.py +++ b/test/functional/tests/stats/test_ioclass_stats.py @@ -28,7 +28,7 @@ from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_tools.disk_utils import Filesystem from test_utils.filesystem.file import File from test_utils.os_utils import sync, Udev -from test_utils.output import CmdException +from connection.utils.output import CmdException from types.size import Size, Unit IoClass = ioclass_config.IoClass