Move output to connection utils
Signed-off-by: Katarzyna Treder <katarzyna.treder@h-partners.com>
This commit is contained in:
@@ -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:
|
||||
|
@@ -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):
|
||||
|
@@ -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):
|
||||
|
0
connection/utils/__init__.py
Normal file
0
connection/utils/__init__.py
Normal file
22
connection/utils/output.py
Normal file
22
connection/utils/output.py
Normal file
@@ -0,0 +1,22 @@
|
||||
#
|
||||
# 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