Move output to connection utils
Signed-off-by: Katarzyna Treder <katarzyna.treder@h-partners.com>
This commit is contained in:
@@ -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():
|
||||
|
@@ -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:
|
||||
|
@@ -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):
|
||||
|
@@ -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:]
|
||||
|
@@ -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
|
||||
|
||||
|
@@ -1,22 +0,0 @@
|
||||
#
|
||||
# Copyright(c) 2019-2021 Intel Corporation
|
||||
# SPDX-License-Identifier: BSD-3-Clause
|
||||
#
|
||||
|
||||
|
||||
class Output:
|
||||
def __init__(self, output_out, output_err, return_code):
|
||||
self.stdout = output_out.decode('utf-8', errors="ignore").rstrip() if \
|
||||
type(output_out) == bytes else output_out
|
||||
self.stderr = output_err.decode('utf-8', errors="ignore").rstrip() if \
|
||||
type(output_err) == bytes else output_err
|
||||
self.exit_code = return_code
|
||||
|
||||
def __str__(self):
|
||||
return f"exit_code: {self.exit_code}\nstdout: {self.stdout}\nstderr: {self.stderr}"
|
||||
|
||||
|
||||
class CmdException(Exception):
|
||||
def __init__(self, message: str, output: Output):
|
||||
super().__init__(f"{message}\n{str(output)}")
|
||||
self.output = output
|
Reference in New Issue
Block a user