diff --git a/connection/base_executor.py b/connection/base_executor.py index 7162fac..3be941c 100644 --- a/connection/base_executor.py +++ b/connection/base_executor.py @@ -8,7 +8,7 @@ import time from datetime import timedelta from core.test_run import TestRun -from test_utils.output import CmdException +from connection.utils.output import CmdException class BaseExecutor: diff --git a/connection/local_executor.py b/connection/local_executor.py index 9c6cad6..b8ba46d 100644 --- a/connection/local_executor.py +++ b/connection/local_executor.py @@ -10,7 +10,7 @@ from datetime import timedelta from connection.base_executor import BaseExecutor from core.test_run import TestRun from test_tools.fs_utils import copy -from test_utils.output import Output, CmdException +from connection.utils.output import Output, CmdException class LocalExecutor(BaseExecutor): diff --git a/connection/ssh_executor.py b/connection/ssh_executor.py index 2415311..173fef5 100644 --- a/connection/ssh_executor.py +++ b/connection/ssh_executor.py @@ -13,7 +13,7 @@ import paramiko from connection.base_executor import BaseExecutor from core.test_run import TestRun, Blocked -from test_utils.output import Output +from connection.utils.output import Output class SshExecutor(BaseExecutor): diff --git a/connection/utils/__init__.py b/connection/utils/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/test_utils/output.py b/connection/utils/output.py similarity index 100% rename from test_utils/output.py rename to connection/utils/output.py diff --git a/internal_plugins/scsi_debug/__init__.py b/internal_plugins/scsi_debug/__init__.py index 95f6563..8902c63 100644 --- a/internal_plugins/scsi_debug/__init__.py +++ b/internal_plugins/scsi_debug/__init__.py @@ -7,7 +7,7 @@ from time import sleep from core.test_run_utils import TestRun from storage_devices.device import Device from test_utils import os_utils -from test_utils.output import CmdException +from connection.utils.output import CmdException class ScsiDebug: diff --git a/log/logger.py b/log/logger.py index 0c82be6..9de1ec3 100644 --- a/log/logger.py +++ b/log/logger.py @@ -15,7 +15,7 @@ import portalocker from log.html_log_config import HtmlLogConfig from log.html_log_manager import HtmlLogManager from log.html_presentation_policy import html_policy -from test_utils.output import Output +from connection.utils.output import Output from test_utils.singleton import Singleton diff --git a/storage_devices/disk.py b/storage_devices/disk.py index 1658abe..8a1dc6c 100644 --- a/storage_devices/disk.py +++ b/storage_devices/disk.py @@ -15,7 +15,7 @@ from storage_devices.device import Device from test_tools import disk_utils, fs_utils, nvme_cli from test_utils import disk_finder from test_utils.os_utils import wait -from test_utils.output import Output +from connection.utils.output import Output from types.size import Unit diff --git a/storage_devices/drbd.py b/storage_devices/drbd.py index 66baeda..a8e2ba8 100644 --- a/storage_devices/drbd.py +++ b/storage_devices/drbd.py @@ -3,14 +3,13 @@ # SPDX-License-Identifier: BSD-3-Clause-Clear # -import os import posixpath from core.test_run import TestRun from storage_devices.device import Device from test_tools.drbdadm import Drbdadm from test_utils.filesystem.symlink import Symlink -from test_utils.output import CmdException +from connection.utils.output import CmdException class Drbd(Device): diff --git a/test_tools/disk_utils.py b/test_tools/disk_utils.py index 901a56e..a02437e 100644 --- a/test_tools/disk_utils.py +++ b/test_tools/disk_utils.py @@ -13,7 +13,7 @@ from core.test_run import TestRun from test_tools import fs_utils from test_tools.dd import Dd from test_tools.fs_utils import readlink, parse_ls_output, ls -from test_utils.output import CmdException +from connection.utils.output import CmdException from types.size import Size, Unit SECTOR_SIZE = 512 diff --git a/test_tools/fio/fio.py b/test_tools/fio/fio.py index 393a530..813de89 100644 --- a/test_tools/fio/fio.py +++ b/test_tools/fio/fio.py @@ -13,7 +13,7 @@ import test_tools.fs_utils from core.test_run import TestRun from test_tools import fs_utils from test_utils import os_utils -from test_utils.output import CmdException +from connection.utils.output import CmdException class Fio: diff --git a/test_tools/linux_packaging.py b/test_tools/linux_packaging.py index 3dd882d..8f1940e 100644 --- a/test_tools/linux_packaging.py +++ b/test_tools/linux_packaging.py @@ -9,7 +9,7 @@ import os import re from core.test_run import TestRun -from test_utils.output import CmdException +from connection.utils.output import CmdException class RpmSet: diff --git a/test_utils/disk_finder.py b/test_utils/disk_finder.py index d738fa1..a02bb85 100644 --- a/test_utils/disk_finder.py +++ b/test_utils/disk_finder.py @@ -9,7 +9,7 @@ from core.test_run import TestRun from test_tools import disk_utils from test_tools.fs_utils import check_if_file_exists, readlink from test_utils import os_utils -from test_utils.output import CmdException +from connection.utils.output import CmdException def find_disks(): diff --git a/test_utils/dmesg.py b/test_utils/dmesg.py index f5ce808..50131b3 100644 --- a/test_utils/dmesg.py +++ b/test_utils/dmesg.py @@ -4,7 +4,7 @@ # from core.test_run import TestRun -from test_utils.output import Output +from connection.utils.output import Output def get_dmesg() -> str: diff --git a/test_utils/git.py b/test_utils/git.py index f52ca2e..83ad6f7 100644 --- a/test_utils/git.py +++ b/test_utils/git.py @@ -9,7 +9,7 @@ import posixpath from core.test_run import TestRun from connection.local_executor import LocalExecutor -from test_utils.output import CmdException +from connection.utils.output import CmdException def __get_executor_and_repo_path(from_dut): diff --git a/test_utils/io_stats.py b/test_utils/io_stats.py index 4f0fe63..fb9607d 100644 --- a/test_utils/io_stats.py +++ b/test_utils/io_stats.py @@ -5,7 +5,7 @@ import re from core.test_run import TestRun -from test_utils.output import CmdException +from connection.utils.output import CmdException SYSFS_LINE_FORMAT = r"^(\d+\s+){10,}\d+$" PROCFS_LINE_FORMAT = r"^\d+\s+\d+\s+[\w-]+\s+" + SYSFS_LINE_FORMAT[1:] diff --git a/test_utils/os_utils.py b/test_utils/os_utils.py index 621a560..4a39786 100644 --- a/test_utils/os_utils.py +++ b/test_utils/os_utils.py @@ -20,7 +20,7 @@ from test_tools.dd import Dd from test_tools.disk_utils import get_sysfs_path from test_tools.fs_utils import check_if_directory_exists, create_directory, check_if_file_exists from test_utils.filesystem.file import File -from test_utils.output import CmdException +from connection.utils.output import CmdException from test_utils.retry import Retry from types.size import Size, Unit