diff --git a/libs/fuzzlib/fuzzer_helper.py b/libs/fuzzlib/fuzzer_helper.py index b8c6217419047f2c6d31f1a22b6e03b4c5b3d2f9..75efdfbb8981439f9b8092a2d048ff8d0039b318 100644 --- a/libs/fuzzlib/fuzzer_helper.py +++ b/libs/fuzzlib/fuzzer_helper.py @@ -27,6 +27,8 @@ import pipes import traceback import time import copy +import shutil +from pprint import pprint from tools.colored import Colored from tools.templates import GN_ENTRY_TEMPLATE @@ -34,8 +36,6 @@ from tools.templates import PROJECT_GN_TEMPLATE from tools.templates import PROJECT_DEMO_TEMPLATE from tools.templates import PROJECT_HEADER_TEMPLATE from tools.templates import PROJECT_XML_TEMPLATE -import shutil -from pprint import pprint from tools.run_result import RunResult CURRENT_DIR = os.path.dirname(os.path.realpath(__file__)) diff --git a/libs/fuzzlib/tools/run_result.py b/libs/fuzzlib/tools/run_result.py index 5fb2b6edc683e9f0a27568eccde9384378da423f..8898e750cbe98998659f572b2b10269aa832a62f 100644 --- a/libs/fuzzlib/tools/run_result.py +++ b/libs/fuzzlib/tools/run_result.py @@ -83,8 +83,8 @@ class RunResult(): if __name__ == "__main__": - cmd_log = "" + CMD_LOG = "" res_obj = RunResult(0, "OK") - res_obj.analysis(cmd_log, "../../../out/") + res_obj.analysis(CMD_LOG, "../../../out/") print(res_obj.crash_info) diff --git a/src/core/build/pretreat_targets.py b/src/core/build/pretreat_targets.py index 7d30c9e13f36535c69eee352b617173dca10004d..c47cac88237a7d14678835ba64fcdbcb992ef68a 100644 --- a/src/core/build/pretreat_targets.py +++ b/src/core/build/pretreat_targets.py @@ -21,8 +21,9 @@ import sys import json import shutil -from core.constants import JsTestConst from xdevice import platform_logger +from core.constants import JsTestConst + LOG = platform_logger("PretreatTargets") diff --git a/src/core/command/console.py b/src/core/command/console.py index a8b38225b68b649bed148d14b360e8c1eca836a1..87bbd962aa5f4f924ba4355f4a26498caa49fe7b 100755 --- a/src/core/command/console.py +++ b/src/core/command/console.py @@ -21,9 +21,10 @@ import sys import signal import platform -from core.constants import ToolCommandType from xdevice import platform_logger from xdevice import EnvironmentManager + +from core.constants import ToolCommandType from core.command.run import Run from core.command.gen import Gen from core.command.display import display_help_info diff --git a/src/core/command/run.py b/src/core/command/run.py index d89d6577e882c39367246e97ec0e78bd5f4ee0b4..109647cca4e4fb1138c112f88ec5df20e3610c9e 100755 --- a/src/core/command/run.py +++ b/src/core/command/run.py @@ -20,12 +20,13 @@ import time import os import sys -from core.constants import SchedulerType from xdevice import Plugin from xdevice import get_plugin from xdevice import platform_logger from xdevice import Scheduler from xdevice import DeviceTestType + +from core.constants import SchedulerType from core.utils import get_build_output_path from core.utils import scan_support_product from core.utils import is_lite_product diff --git a/src/core/testcase/testcase_manager.py b/src/core/testcase/testcase_manager.py index d0ac52af924604fa789f25c1dff2895ea3282e7c..f6837f056162c121b1290749b9dacf4fa5da0bcb 100755 --- a/src/core/testcase/testcase_manager.py +++ b/src/core/testcase/testcase_manager.py @@ -18,9 +18,9 @@ import os import copy +from xdevice import platform_logger from core.utils import get_file_list_by_postfix from core.config.config_manager import FilterConfigManager -from xdevice import platform_logger LOG = platform_logger("TestcaseManager") diff --git a/src/main/__init__.py b/src/main/__init__.py index d414ea5ceda3d5e6ef735cbf798592bf73c98851..81cae9cb7a987e10a92ec5570ad530372788ccea 100755 --- a/src/main/__init__.py +++ b/src/main/__init__.py @@ -16,8 +16,8 @@ # limitations under the License. # -from . import _init_global_config from core.command.console import Console +from . import _init_global_config __all__ = [ "Console", diff --git a/src/main/__main__.py b/src/main/__main__.py index 72a567ed64d0af2298772c6b5c5f0d69c26447cb..5fe4199fd5e4c66ce4d8222c7db69081e7368c5c 100755 --- a/src/main/__main__.py +++ b/src/main/__main__.py @@ -17,8 +17,8 @@ # import sys -from main import Console from xdevice import platform_logger +from main import Console LOG = platform_logger("main")