diff --git a/static_core/codecheck_ignore.json b/static_core/codecheck_ignore.json index a5acf04034af00484effe3573f1ca8501cf1d1bb..95d2a34c021f7dba9aa7dcc556886aa930c87f79 100644 --- a/static_core/codecheck_ignore.json +++ b/static_core/codecheck_ignore.json @@ -199,11 +199,11 @@ "tests/panda": "*", "tests/tests-u-runner/runner": "*", "tests/tests-u-runner/runner_test.py": "*", - "tests/tests-u-runner-2/runner/suites/__init__.py": "*", - "tests/tests-u-runner-2/runner/test/config_test/__init__.py": "*", - "tests/tests-u-runner-2/runner/test/launches_test/__init__.py": "*", - "tests/tests-u-runner-2/runner/test/launches_test/data/data_test_suite0.py": "*", - "tests/tests-u-runner-2/runner/test/metadata_test/__init__.py": "*", + "tests/tests-u-runner-2/urunner/runner/suites/__init__.py": "*", + "tests/tests-u-runner-2/urunner/runner/test/config_test/__init__.py": "*", + "tests/tests-u-runner-2/urunner/runner/test/launches_test/__init__.py": "*", + "tests/tests-u-runner-2/urunner/runner/test/launches_test/data/data_test_suite0.py": "*", + "tests/tests-u-runner-2/urunner/runner/test/metadata_test/__init__.py": "*", "tests/verifier-tests": "*", "tests/vm-benchmarks": "*", "tools/ark_js_napi_cli": "*", diff --git a/static_core/scripts/install-deps-ubuntu b/static_core/scripts/install-deps-ubuntu index 2b12c17ac8884a21a8f6fddb5ada9a88fcc4e1cd..881655bc830b4f1fead9b6debb35ce1be6eb420c 100755 --- a/static_core/scripts/install-deps-ubuntu +++ b/static_core/scripts/install-deps-ubuntu @@ -163,6 +163,7 @@ function install_pip_dep fi } + function enable_test_toolchain_repo { set -x diff --git a/static_core/tests/tests-u-runner-2/.pylintrc b/static_core/tests/tests-u-runner-2/.pylintrc deleted file mode 100644 index 939a44ac05204c25b1c2b7306a18360ae0b68d89..0000000000000000000000000000000000000000 --- a/static_core/tests/tests-u-runner-2/.pylintrc +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright (c) 2021-2025 Huawei Device Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -[MAIN] -ignore=.git -py-version=3.10 -recursive=yes - -[MESSAGES CONTROL] -# C0114: Missing module docstring (missing-module-docstring) -# C0115: Missing class docstring (missing-class-docstring) -# C0116: Missing function or method docstring (missing-function-docstring) -# R0801: Similar lines in ... files ... (duplicate-code) -# R0902: Too many instance attributes (too-many-instance-attributes) -# R0903: Too few public methods (too-few-public-methods) -# R0913: Too many arguments (too-many-arguments) -# R0914: Too many local variables (too-many-locals) -# W1202: Use % formatting in logging functions and pass the % parameters as arguments (logging-format-interpolation) -# R0917: Too many positional arguments -disable=missing-module-docstring, - missing-class-docstring, - missing-function-docstring, - too-many-instance-attributes, - too-many-arguments, - logging-format-interpolation, - logging-fstring-interpolation, - too-few-public-methods, - too-many-positional-arguments - - -[FORMAT] -max-line-length=120 diff --git a/static_core/tests/tests-u-runner-2/linter.sh b/static_core/tests/tests-u-runner-2/linter.sh index 1ad1dc24040db2f39a76e22eff7d2c8d303c10aa..1e47e046a77976228531a123ac332f2557a831b5 100755 --- a/static_core/tests/tests-u-runner-2/linter.sh +++ b/static_core/tests/tests-u-runner-2/linter.sh @@ -33,18 +33,18 @@ RUNNER_DIR=${ROOT_DIR}/tests/tests-u-runner-2 cd "${RUNNER_DIR}" echo "Pylint /runner, main.py" -pylint --rcfile .pylintrc runner main.py --ignore=test262,config_test,reports,runner_file_based.py -pylint --rcfile .pylintrc runner/extensions/generators/test262/ runner/test/config_test runner/reports runner/runner_file_based.py --disable=duplicate-code +pylint urunner/runner urunner/main.py --ignore=test262,config_test,reports,runner_file_based.py +pylint urunner/runner/extensions/generators/test262/ urunner/test/config_test urunner/runner/reports urunner/runner/runner_file_based.py --disable=duplicate-code save_exit_code ${EXIT_CODE} $? EXIT_CODE=$? echo "MyPy main.py" -mypy main.py +mypy urunner/main.py save_exit_code ${EXIT_CODE} $? EXIT_CODE=$? echo "MyPy /runner" -mypy -p runner +mypy -p urunner save_exit_code ${EXIT_CODE} $? EXIT_CODE=$? diff --git a/static_core/tests/tests-u-runner-2/mypy.ini b/static_core/tests/tests-u-runner-2/mypy.ini deleted file mode 100644 index 5453cd04aa9bdfd02596645e80eb02627a3fcb9e..0000000000000000000000000000000000000000 --- a/static_core/tests/tests-u-runner-2/mypy.ini +++ /dev/null @@ -1,23 +0,0 @@ -[mypy] -python_version = 3.10 - -no_incremental = True -cache_dir=/dev/null - -disallow_untyped_defs = True - -disallow_any_unimported = True -disallow_any_explicit = True - -no_implicit_optional = True -show_error_codes = True -check_untyped_defs = True - -warn_redundant_casts = True -warn_unused_ignores = True -warn_return_any = True -warn_unreachable = True -enable_error_code = ignore-without-code - -[mypy-tqdm.*] -ignore_missing_imports = True \ No newline at end of file diff --git a/static_core/tests/tests-u-runner-2/pyproject.toml b/static_core/tests/tests-u-runner-2/pyproject.toml index 923266a35ad62e40bbc82a9404086597fa82566a..b6413c81d2628a36281aaefdc9dca5e2de380e28 100644 --- a/static_core/tests/tests-u-runner-2/pyproject.toml +++ b/static_core/tests/tests-u-runner-2/pyproject.toml @@ -11,13 +11,80 @@ # See the License for the specific language governing permissions and # limitations under the License. [project] -name = "URunner-2" +name = "urunner" +version = "2.0" +description = "URunner test framework" +readme = "README.md" +requires-python = ">=3.10" +dependencies = ["dataclasses==0.6", + "python-dotenv==0.20.0", + "pytz==2025.2", + "Jinja2==3.1.2", + "MarkupSafe==2.1.1", + "PyYaml==6.0", + "tqdm==4.64.0", + "PyPDF2==3.0.1", + "jinja2-cli==0.8.2", + "tox==4.20.0", + "mypy==1.15.0", + "mypy-extensions==1.0.0", + "tomli==2.2.1", + "typing-extensions==4.13.2", + "types-PyYAML==6.0.12.4", + "types-pytz==2025.2.0.20250326", + "astroid==3.3.9", + "dill==0.3.6", + "isort==6.0.1", + "lazy-object-proxy==1.11.0", + "mccabe==0.7.0", + "platformdirs==4.3.7", + "pylint==3.3.6", + "tomlkit==0.11.6", + "wrapt==1.14.1", + "flake8==7.2.0", + "flake8-bandit==4.1.1", + "flake8-coding==1.3.2", + "flake8-executable==2.1.3", + "pep8-naming==0.14.1", + "pycodestyle==2.13.0", + "ruff==0.11.6", + "radon==6.0.1"] + +[project.scripts] +urunner-run = "urunner.main:main" + +[build-system] +requires = ["setuptools"] +build-backend = "setuptools.build_meta" + +[tool.setuptools.package-data] +"urunner" = ["cfg/**/*.yaml"] + +[tool.mypy] +python_version = "3.10" +no_incremental = true +cache_dir = "/dev/null" +disallow_untyped_defs = true +disallow_any_unimported = true +disallow_any_explicit = true +check_untyped_defs = true +no_implicit_optional = true +show_error_codes = true +warn_redundant_casts = true +warn_unused_ignores = true +warn_return_any = true +warn_unreachable = true +enable_error_code = "ignore-without-code" + +[[tool.mypy.overrides]] +module = "tqdm.*" +ignore_missing_imports = true [tool.ruff] target-version = "py310" - line-length = 120 +src = ["."] exclude = [ ".git", @@ -33,10 +100,10 @@ exclude = [ # - UP: pyupgrade # - I: isort # - RUF - specific rules +[tool.ruff.lint] +select = ["E", "F", "B", "UP", "I", "RUF"] -lint.select = ["E", "F", "B", "UP", "I", "RUF"] - -lint.ignore = [ +ignore = [ "D100", # missing-module-docstring "D101", # missing-class-docstring "D102", # missing-function-docstring @@ -47,3 +114,25 @@ lint.ignore = [ "UP009", # ignore encoding ] +[tool.pylint.main] +ignore=[".git"] +py-version="3.10" +recursive="yes" + +[tool.pylint.'MESSAGES CONTROL'] +# C0114: Missing module docstring (missing-module-docstring) +# C0115: Missing class docstring (missing-class-docstring) +# C0116: Missing function or method docstring (missing-function-docstring) +# R0902: Too many instance attributes (too-many-instance-attributes) +# R0903: Too few public methods (too-few-public-methods) +# R0913: Too many arguments (too-many-arguments) +# W1202: Use % formatting in logging functions and pass the % parameters as arguments (logging-format-interpolation) +# W1203: loggin-fstring-interpolation +# R0917: Too many positional arguments +disable = "C0114, C0115, C0116, R0902, R0913, R0903, R0917, W1202, W1203" + +[tool.pylint.format] +max-line-length=120 + +[tool.pylint.'MASTER'] +init-hook = "import sys; sys.path.append('.')" diff --git a/static_core/tests/tests-u-runner-2/runner-test.sh b/static_core/tests/tests-u-runner-2/runner-test.sh index 7abfe593e6cc1630a5fdadde53d278f20ad7b841..aabbb640bdd7e337d78e8a131259cb37793776c6 100755 --- a/static_core/tests/tests-u-runner-2/runner-test.sh +++ b/static_core/tests/tests-u-runner-2/runner-test.sh @@ -24,7 +24,7 @@ source "${ROOT_DIR}/scripts/python/venv-utils.sh" activate_venv set +e -python3 -B -m unittest discover -s "${SCRIPT_DIR}/runner/test" -p "*_test*.py" +python3 -B -m unittest discover -s "${SCRIPT_DIR}/urunner/test" -p "*_test*.py" EXIT_CODE=$? set -e diff --git a/static_core/tests/tests-u-runner-2/runner.sh b/static_core/tests/tests-u-runner-2/runner.sh index c3a4cbf1886b3fe9b0105d08aaed855508d55700..75de0517c4f7f1f90e00fcd4762a8891586db899 100755 --- a/static_core/tests/tests-u-runner-2/runner.sh +++ b/static_core/tests/tests-u-runner-2/runner.sh @@ -24,7 +24,9 @@ fi SCRIPT_DIR=$(realpath "$(dirname "${0}")") ROOT_DIR=${STATIC_ROOT_DIR:-"${SCRIPT_DIR}/../.."} -RUNNER="${ROOT_DIR}/tests/tests-u-runner-2/main.py" +export PYTHONPATH="${SCRIPT_DIR}:$PYTHONPATH" + +RUNNER="${ROOT_DIR}/tests/tests-u-runner-2/urunner/main.py" source "${ROOT_DIR}/scripts/python/venv-utils.sh" @@ -32,8 +34,11 @@ activate_venv set +e echo "${RUNNER_OPTIONS}" +echo "${PYTHONPATH}" python3 -B "${RUNNER}" "$@" +#cd "${ROOT_DIR}/tests/tests-u-runner-2" +#urunner-run "$@" EXIT_CODE=$? set -e diff --git a/static_core/tests/tests-u-runner-2/runner/__init__.py b/static_core/tests/tests-u-runner-2/urunner/__init__.py similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/__init__.py rename to static_core/tests/tests-u-runner-2/urunner/__init__.py diff --git a/static_core/tests/tests-u-runner-2/cfg/test-suites/astchecker.yaml b/static_core/tests/tests-u-runner-2/urunner/cfg/test-suites/astchecker.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/cfg/test-suites/astchecker.yaml rename to static_core/tests/tests-u-runner-2/urunner/cfg/test-suites/astchecker.yaml diff --git a/static_core/tests/tests-u-runner-2/cfg/test-suites/declgenparser.yaml b/static_core/tests/tests-u-runner-2/urunner/cfg/test-suites/declgenparser.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/cfg/test-suites/declgenparser.yaml rename to static_core/tests/tests-u-runner-2/urunner/cfg/test-suites/declgenparser.yaml diff --git a/static_core/tests/tests-u-runner-2/cfg/test-suites/ets-cts.yaml b/static_core/tests/tests-u-runner-2/urunner/cfg/test-suites/ets-cts.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/cfg/test-suites/ets-cts.yaml rename to static_core/tests/tests-u-runner-2/urunner/cfg/test-suites/ets-cts.yaml diff --git a/static_core/tests/tests-u-runner-2/cfg/test-suites/ets-es-checked.yaml b/static_core/tests/tests-u-runner-2/urunner/cfg/test-suites/ets-es-checked.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/cfg/test-suites/ets-es-checked.yaml rename to static_core/tests/tests-u-runner-2/urunner/cfg/test-suites/ets-es-checked.yaml diff --git a/static_core/tests/tests-u-runner-2/cfg/test-suites/ets-func-tests.yaml b/static_core/tests/tests-u-runner-2/urunner/cfg/test-suites/ets-func-tests.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/cfg/test-suites/ets-func-tests.yaml rename to static_core/tests/tests-u-runner-2/urunner/cfg/test-suites/ets-func-tests.yaml diff --git a/static_core/tests/tests-u-runner-2/cfg/test-suites/ets-gc-stress.yaml b/static_core/tests/tests-u-runner-2/urunner/cfg/test-suites/ets-gc-stress.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/cfg/test-suites/ets-gc-stress.yaml rename to static_core/tests/tests-u-runner-2/urunner/cfg/test-suites/ets-gc-stress.yaml diff --git a/static_core/tests/tests-u-runner-2/cfg/test-suites/ets-runtime.yaml b/static_core/tests/tests-u-runner-2/urunner/cfg/test-suites/ets-runtime.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/cfg/test-suites/ets-runtime.yaml rename to static_core/tests/tests-u-runner-2/urunner/cfg/test-suites/ets-runtime.yaml diff --git a/static_core/tests/tests-u-runner-2/cfg/test-suites/hermes.yaml b/static_core/tests/tests-u-runner-2/urunner/cfg/test-suites/hermes.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/cfg/test-suites/hermes.yaml rename to static_core/tests/tests-u-runner-2/urunner/cfg/test-suites/hermes.yaml diff --git a/static_core/tests/tests-u-runner-2/cfg/test-suites/parser.yaml b/static_core/tests/tests-u-runner-2/urunner/cfg/test-suites/parser.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/cfg/test-suites/parser.yaml rename to static_core/tests/tests-u-runner-2/urunner/cfg/test-suites/parser.yaml diff --git a/static_core/tests/tests-u-runner-2/cfg/test-suites/test262.yaml b/static_core/tests/tests-u-runner-2/urunner/cfg/test-suites/test262.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/cfg/test-suites/test262.yaml rename to static_core/tests/tests-u-runner-2/urunner/cfg/test-suites/test262.yaml diff --git a/static_core/tests/tests-u-runner-2/cfg/test-suites/unit-tests.yaml b/static_core/tests/tests-u-runner-2/urunner/cfg/test-suites/unit-tests.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/cfg/test-suites/unit-tests.yaml rename to static_core/tests/tests-u-runner-2/urunner/cfg/test-suites/unit-tests.yaml diff --git a/static_core/tests/tests-u-runner-2/cfg/test-suites/xgc-ts-tests.yaml b/static_core/tests/tests-u-runner-2/urunner/cfg/test-suites/xgc-ts-tests.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/cfg/test-suites/xgc-ts-tests.yaml rename to static_core/tests/tests-u-runner-2/urunner/cfg/test-suites/xgc-ts-tests.yaml diff --git a/static_core/tests/tests-u-runner-2/cfg/workflows/ark-aot-pgo.yaml b/static_core/tests/tests-u-runner-2/urunner/cfg/workflows/ark-aot-pgo.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/cfg/workflows/ark-aot-pgo.yaml rename to static_core/tests/tests-u-runner-2/urunner/cfg/workflows/ark-aot-pgo.yaml diff --git a/static_core/tests/tests-u-runner-2/cfg/workflows/arkjs-int.yaml b/static_core/tests/tests-u-runner-2/urunner/cfg/workflows/arkjs-int.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/cfg/workflows/arkjs-int.yaml rename to static_core/tests/tests-u-runner-2/urunner/cfg/workflows/arkjs-int.yaml diff --git a/static_core/tests/tests-u-runner-2/cfg/workflows/arkjs/env_hzjsvm_sample.yaml b/static_core/tests/tests-u-runner-2/urunner/cfg/workflows/arkjs/env_hzjsvm_sample.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/cfg/workflows/arkjs/env_hzjsvm_sample.yaml rename to static_core/tests/tests-u-runner-2/urunner/cfg/workflows/arkjs/env_hzjsvm_sample.yaml diff --git a/static_core/tests/tests-u-runner-2/cfg/workflows/arkjs/hybrid-es2abc.yaml b/static_core/tests/tests-u-runner-2/urunner/cfg/workflows/arkjs/hybrid-es2abc.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/cfg/workflows/arkjs/hybrid-es2abc.yaml rename to static_core/tests/tests-u-runner-2/urunner/cfg/workflows/arkjs/hybrid-es2abc.yaml diff --git a/static_core/tests/tests-u-runner-2/cfg/workflows/arkjs/hybrid.yaml b/static_core/tests/tests-u-runner-2/urunner/cfg/workflows/arkjs/hybrid.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/cfg/workflows/arkjs/hybrid.yaml rename to static_core/tests/tests-u-runner-2/urunner/cfg/workflows/arkjs/hybrid.yaml diff --git a/static_core/tests/tests-u-runner-2/cfg/workflows/arkjs/hzjsvm_vs_panda.yaml b/static_core/tests/tests-u-runner-2/urunner/cfg/workflows/arkjs/hzjsvm_vs_panda.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/cfg/workflows/arkjs/hzjsvm_vs_panda.yaml rename to static_core/tests/tests-u-runner-2/urunner/cfg/workflows/arkjs/hzjsvm_vs_panda.yaml diff --git a/static_core/tests/tests-u-runner-2/cfg/workflows/arkjs/mate60pro.yaml b/static_core/tests/tests-u-runner-2/urunner/cfg/workflows/arkjs/mate60pro.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/cfg/workflows/arkjs/mate60pro.yaml rename to static_core/tests/tests-u-runner-2/urunner/cfg/workflows/arkjs/mate60pro.yaml diff --git a/static_core/tests/tests-u-runner-2/cfg/workflows/arkjs/rk3568.yaml b/static_core/tests/tests-u-runner-2/urunner/cfg/workflows/arkjs/rk3568.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/cfg/workflows/arkjs/rk3568.yaml rename to static_core/tests/tests-u-runner-2/urunner/cfg/workflows/arkjs/rk3568.yaml diff --git a/static_core/tests/tests-u-runner-2/cfg/workflows/arkjs/wf_hzjsvm.yaml b/static_core/tests/tests-u-runner-2/urunner/cfg/workflows/arkjs/wf_hzjsvm.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/cfg/workflows/arkjs/wf_hzjsvm.yaml rename to static_core/tests/tests-u-runner-2/urunner/cfg/workflows/arkjs/wf_hzjsvm.yaml diff --git a/static_core/tests/tests-u-runner-2/cfg/workflows/arkjs/wf_hzjsvm_device.yaml b/static_core/tests/tests-u-runner-2/urunner/cfg/workflows/arkjs/wf_hzjsvm_device.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/cfg/workflows/arkjs/wf_hzjsvm_device.yaml rename to static_core/tests/tests-u-runner-2/urunner/cfg/workflows/arkjs/wf_hzjsvm_device.yaml diff --git a/static_core/tests/tests-u-runner-2/cfg/workflows/arkjs/wf_hzjsvm_device_aot.yaml b/static_core/tests/tests-u-runner-2/urunner/cfg/workflows/arkjs/wf_hzjsvm_device_aot.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/cfg/workflows/arkjs/wf_hzjsvm_device_aot.yaml rename to static_core/tests/tests-u-runner-2/urunner/cfg/workflows/arkjs/wf_hzjsvm_device_aot.yaml diff --git a/static_core/tests/tests-u-runner-2/cfg/workflows/hybrid-ark.yaml b/static_core/tests/tests-u-runner-2/urunner/cfg/workflows/hybrid-ark.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/cfg/workflows/hybrid-ark.yaml rename to static_core/tests/tests-u-runner-2/urunner/cfg/workflows/hybrid-ark.yaml diff --git a/static_core/tests/tests-u-runner-2/cfg/workflows/hybrid-es2panda-verifier.yaml b/static_core/tests/tests-u-runner-2/urunner/cfg/workflows/hybrid-es2panda-verifier.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/cfg/workflows/hybrid-es2panda-verifier.yaml rename to static_core/tests/tests-u-runner-2/urunner/cfg/workflows/hybrid-es2panda-verifier.yaml diff --git a/static_core/tests/tests-u-runner-2/cfg/workflows/hybrid-panda-int.yaml b/static_core/tests/tests-u-runner-2/urunner/cfg/workflows/hybrid-panda-int.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/cfg/workflows/hybrid-panda-int.yaml rename to static_core/tests/tests-u-runner-2/urunner/cfg/workflows/hybrid-panda-int.yaml diff --git a/static_core/tests/tests-u-runner-2/cfg/workflows/hybrid-panda-jit.yaml b/static_core/tests/tests-u-runner-2/urunner/cfg/workflows/hybrid-panda-jit.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/cfg/workflows/hybrid-panda-jit.yaml rename to static_core/tests/tests-u-runner-2/urunner/cfg/workflows/hybrid-panda-jit.yaml diff --git a/static_core/tests/tests-u-runner-2/cfg/workflows/only-ark-aot.yaml b/static_core/tests/tests-u-runner-2/urunner/cfg/workflows/only-ark-aot.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/cfg/workflows/only-ark-aot.yaml rename to static_core/tests/tests-u-runner-2/urunner/cfg/workflows/only-ark-aot.yaml diff --git a/static_core/tests/tests-u-runner-2/cfg/workflows/only-es2panda.yaml b/static_core/tests/tests-u-runner-2/urunner/cfg/workflows/only-es2panda.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/cfg/workflows/only-es2panda.yaml rename to static_core/tests/tests-u-runner-2/urunner/cfg/workflows/only-es2panda.yaml diff --git a/static_core/tests/tests-u-runner-2/cfg/workflows/only-runtime.yaml b/static_core/tests/tests-u-runner-2/urunner/cfg/workflows/only-runtime.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/cfg/workflows/only-runtime.yaml rename to static_core/tests/tests-u-runner-2/urunner/cfg/workflows/only-runtime.yaml diff --git a/static_core/tests/tests-u-runner-2/cfg/workflows/panda-aot-pgo.yaml b/static_core/tests/tests-u-runner-2/urunner/cfg/workflows/panda-aot-pgo.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/cfg/workflows/panda-aot-pgo.yaml rename to static_core/tests/tests-u-runner-2/urunner/cfg/workflows/panda-aot-pgo.yaml diff --git a/static_core/tests/tests-u-runner-2/cfg/workflows/panda-aot.yaml b/static_core/tests/tests-u-runner-2/urunner/cfg/workflows/panda-aot.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/cfg/workflows/panda-aot.yaml rename to static_core/tests/tests-u-runner-2/urunner/cfg/workflows/panda-aot.yaml diff --git a/static_core/tests/tests-u-runner-2/cfg/workflows/panda-int.yaml b/static_core/tests/tests-u-runner-2/urunner/cfg/workflows/panda-int.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/cfg/workflows/panda-int.yaml rename to static_core/tests/tests-u-runner-2/urunner/cfg/workflows/panda-int.yaml diff --git a/static_core/tests/tests-u-runner-2/cfg/workflows/panda-jit.yaml b/static_core/tests/tests-u-runner-2/urunner/cfg/workflows/panda-jit.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/cfg/workflows/panda-jit.yaml rename to static_core/tests/tests-u-runner-2/urunner/cfg/workflows/panda-jit.yaml diff --git a/static_core/tests/tests-u-runner-2/main.py b/static_core/tests/tests-u-runner-2/urunner/main.py similarity index 89% rename from static_core/tests/tests-u-runner-2/main.py rename to static_core/tests/tests-u-runner-2/urunner/main.py index d5392b9efbe8799ee38d78c61733a4063fe6402e..2f541c252153f15474ae61267b2d82193baf9e54 100644 --- a/static_core/tests/tests-u-runner-2/main.py +++ b/static_core/tests/tests-u-runner-2/urunner/main.py @@ -24,16 +24,16 @@ from typing import Any, cast import pytz -from runner.common_exceptions import InvalidConfiguration, RunnerException -from runner.enum_types.verbose_format import VerboseKind -from runner.environment import RunnerEnv -from runner.init_runner import InitRunner -from runner.logger import Log -from runner.options.cli_options import get_args -from runner.options.config import Config -from runner.runner_base import Runner -from runner.suites.runner_standard_flow import RunnerStandardFlow -from runner.utils import pretty_divider +from urunner.runner.common_exceptions import InvalidConfiguration, RunnerException +from urunner.runner.enum_types.verbose_format import VerboseKind +from urunner.runner.environment import RunnerEnv +from urunner.runner.init_runner import InitRunner +from urunner.runner.logger import Log +from urunner.runner.options.cli_options import get_args +from urunner.runner.options.config import Config +from urunner.runner.runner_base import Runner +from urunner.runner.suites.runner_standard_flow import RunnerStandardFlow +from urunner.runner.utils import pretty_divider def main() -> None: diff --git a/static_core/tests/tests-u-runner-2/urunner/ruff.toml b/static_core/tests/tests-u-runner-2/urunner/ruff.toml new file mode 100644 index 0000000000000000000000000000000000000000..104bd590204dfa457a483c4f5a77eb7ab3740e04 --- /dev/null +++ b/static_core/tests/tests-u-runner-2/urunner/ruff.toml @@ -0,0 +1,15 @@ +# Copyright (c) 2021-2025 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +extend = "../pyproject.toml" +src = ["./"] \ No newline at end of file diff --git a/static_core/tests/tests-u-runner-2/runner/reports/__init__.py b/static_core/tests/tests-u-runner-2/urunner/runner/__init__.py similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/reports/__init__.py rename to static_core/tests/tests-u-runner-2/urunner/runner/__init__.py diff --git a/static_core/tests/tests-u-runner-2/runner/chapters.py b/static_core/tests/tests-u-runner-2/urunner/runner/chapters.py similarity index 96% rename from static_core/tests/tests-u-runner-2/runner/chapters.py rename to static_core/tests/tests-u-runner-2/urunner/runner/chapters.py index 2aea9d2c8ff77de76c8310063e0c6a824beb4056..c7426d450a6de70fd3c838c23d8a4188df271387 100644 --- a/static_core/tests/tests-u-runner-2/runner/chapters.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/chapters.py @@ -20,9 +20,9 @@ from collections.abc import Sequence from dataclasses import dataclass from pathlib import Path -from runner.common_exceptions import CyclicDependencyChapterException, IncorrectFileFormatChapterException -from runner.logger import Log -from runner.options.yaml_document import YamlDocument +from urunner.runner.common_exceptions import CyclicDependencyChapterException, IncorrectFileFormatChapterException +from urunner.runner.logger import Log +from urunner.runner.options.yaml_document import YamlDocument @dataclass diff --git a/static_core/tests/tests-u-runner-2/runner/code_coverage/__init__.py b/static_core/tests/tests-u-runner-2/urunner/runner/code_coverage/__init__.py similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/code_coverage/__init__.py rename to static_core/tests/tests-u-runner-2/urunner/runner/code_coverage/__init__.py diff --git a/static_core/tests/tests-u-runner-2/runner/code_coverage/cmd_executor.py b/static_core/tests/tests-u-runner-2/urunner/runner/code_coverage/cmd_executor.py similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/code_coverage/cmd_executor.py rename to static_core/tests/tests-u-runner-2/urunner/runner/code_coverage/cmd_executor.py diff --git a/static_core/tests/tests-u-runner-2/runner/code_coverage/coverage_dir.py b/static_core/tests/tests-u-runner-2/urunner/runner/code_coverage/coverage_dir.py similarity index 98% rename from static_core/tests/tests-u-runner-2/runner/code_coverage/coverage_dir.py rename to static_core/tests/tests-u-runner-2/urunner/runner/code_coverage/coverage_dir.py index cd1c4b45b751c408d02984d10aa6ab5cef53958f..0aab2025f1ed606de213c462048edae7a8dba911 100644 --- a/static_core/tests/tests-u-runner-2/runner/code_coverage/coverage_dir.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/code_coverage/coverage_dir.py @@ -18,7 +18,7 @@ from functools import cached_property from pathlib import Path -from runner.options.options_general import GeneralOptions +from urunner.runner.options.options_general import GeneralOptions class CoverageDir: diff --git a/static_core/tests/tests-u-runner-2/runner/code_coverage/coverage_manager.py b/static_core/tests/tests-u-runner-2/urunner/runner/code_coverage/coverage_manager.py similarity index 92% rename from static_core/tests/tests-u-runner-2/runner/code_coverage/coverage_manager.py rename to static_core/tests/tests-u-runner-2/urunner/runner/code_coverage/coverage_manager.py index d14cc9fbb8b19aa7248368c1a2c8f07bea459563..0da1fa2fea3b9f45377d5a00767660c87d693380 100644 --- a/static_core/tests/tests-u-runner-2/runner/code_coverage/coverage_manager.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/code_coverage/coverage_manager.py @@ -20,10 +20,10 @@ import platform import threading from pathlib import Path -from runner.code_coverage.cmd_executor import CmdExecutor, LinuxCmdExecutor -from runner.code_coverage.coverage_dir import CoverageDir -from runner.code_coverage.lcov_tool import LcovTool -from runner.code_coverage.llvm_cov_tool import LlvmCovTool +from urunner.runner.code_coverage.cmd_executor import CmdExecutor, LinuxCmdExecutor +from urunner.runner.code_coverage.coverage_dir import CoverageDir +from urunner.runner.code_coverage.lcov_tool import LcovTool +from urunner.runner.code_coverage.llvm_cov_tool import LlvmCovTool class CoverageManager: diff --git a/static_core/tests/tests-u-runner-2/runner/code_coverage/lcov_tool.py b/static_core/tests/tests-u-runner-2/urunner/runner/code_coverage/lcov_tool.py similarity index 98% rename from static_core/tests/tests-u-runner-2/runner/code_coverage/lcov_tool.py rename to static_core/tests/tests-u-runner-2/urunner/runner/code_coverage/lcov_tool.py index 142d7bb3c325f55a0e257abfa64a23d5223b0af5..347e81e7b9ba1a99f54e02d366289f0cc1b24f39 100755 --- a/static_core/tests/tests-u-runner-2/runner/code_coverage/lcov_tool.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/code_coverage/lcov_tool.py @@ -19,8 +19,8 @@ import uuid from multiprocessing import current_process from pathlib import Path -from runner.code_coverage.cmd_executor import CmdExecutor -from runner.code_coverage.coverage_dir import CoverageDir +from urunner.runner.code_coverage.cmd_executor import CmdExecutor +from urunner.runner.code_coverage.coverage_dir import CoverageDir class LcovTool: diff --git a/static_core/tests/tests-u-runner-2/runner/code_coverage/llvm_cov_tool.py b/static_core/tests/tests-u-runner-2/urunner/runner/code_coverage/llvm_cov_tool.py similarity index 98% rename from static_core/tests/tests-u-runner-2/runner/code_coverage/llvm_cov_tool.py rename to static_core/tests/tests-u-runner-2/urunner/runner/code_coverage/llvm_cov_tool.py index a7428a0def89a6902f63009da95741bcad122bf1..5a2e2bdfca6548aedfa49f0b78d0c99bda6a918f 100755 --- a/static_core/tests/tests-u-runner-2/runner/code_coverage/llvm_cov_tool.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/code_coverage/llvm_cov_tool.py @@ -19,9 +19,9 @@ import uuid from multiprocessing import current_process from pathlib import Path -from runner.code_coverage.cmd_executor import CmdExecutor -from runner.code_coverage.coverage_dir import CoverageDir -from runner.utils import get_opener, write_2_file +from urunner.runner.code_coverage.cmd_executor import CmdExecutor +from urunner.runner.code_coverage.coverage_dir import CoverageDir +from urunner.runner.utils import get_opener, write_2_file LLVM_COV_TOOLS_VERSION_NUMBER = '14' diff --git a/static_core/tests/tests-u-runner-2/runner/common_exceptions.py b/static_core/tests/tests-u-runner-2/urunner/runner/common_exceptions.py similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/common_exceptions.py rename to static_core/tests/tests-u-runner-2/urunner/runner/common_exceptions.py diff --git a/static_core/tests/tests-u-runner-2/runner/cpumask.py b/static_core/tests/tests-u-runner-2/urunner/runner/cpumask.py similarity index 95% rename from static_core/tests/tests-u-runner-2/runner/cpumask.py rename to static_core/tests/tests-u-runner-2/urunner/runner/cpumask.py index f6b2dc2358601c8f30cca0e699ec9e626b8f50c3..4c7ab086571add38d2e35173bd3fdc48d30fdaed 100644 --- a/static_core/tests/tests-u-runner-2/runner/cpumask.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/cpumask.py @@ -19,9 +19,9 @@ import os import subprocess from pathlib import Path -from runner.common_exceptions import InvalidConfiguration, RunnerException -from runner.logger import Log -from runner.utils import remove_prefix +from urunner.runner.common_exceptions import InvalidConfiguration, RunnerException +from urunner.runner.logger import Log +from urunner.runner.utils import remove_prefix _LOGGER = Log.get_logger(__file__) diff --git a/static_core/tests/tests-u-runner-2/runner/descriptor.py b/static_core/tests/tests-u-runner-2/urunner/runner/descriptor.py similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/descriptor.py rename to static_core/tests/tests-u-runner-2/urunner/runner/descriptor.py diff --git a/static_core/tests/tests-u-runner-2/runner/enum_types/__init__.py b/static_core/tests/tests-u-runner-2/urunner/runner/enum_types/__init__.py similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/enum_types/__init__.py rename to static_core/tests/tests-u-runner-2/urunner/runner/enum_types/__init__.py diff --git a/static_core/tests/tests-u-runner-2/runner/enum_types/base_enum.py b/static_core/tests/tests-u-runner-2/urunner/runner/enum_types/base_enum.py similarity index 96% rename from static_core/tests/tests-u-runner-2/runner/enum_types/base_enum.py rename to static_core/tests/tests-u-runner-2/urunner/runner/enum_types/base_enum.py index c2a0cb19b76f16b05850deb2e8e241df010f1bc9..042d1a9eaf5cb04e4957ef1701fefa8a3f68818c 100644 --- a/static_core/tests/tests-u-runner-2/runner/enum_types/base_enum.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/enum_types/base_enum.py @@ -18,7 +18,7 @@ from enum import Enum from typing import NoReturn, TypeVar -from runner.common_exceptions import IncorrectEnumValue +from urunner.runner.common_exceptions import IncorrectEnumValue EnumT = TypeVar("EnumT", bound='BaseEnum') diff --git a/static_core/tests/tests-u-runner-2/runner/enum_types/config_type.py b/static_core/tests/tests-u-runner-2/urunner/runner/enum_types/config_type.py similarity index 93% rename from static_core/tests/tests-u-runner-2/runner/enum_types/config_type.py rename to static_core/tests/tests-u-runner-2/urunner/runner/enum_types/config_type.py index e130368bc2405388232af7ed74db49e0068f5ee6..3e94bdb48da4ee00e10a5d47162c9ef69f995ee4 100644 --- a/static_core/tests/tests-u-runner-2/runner/enum_types/config_type.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/enum_types/config_type.py @@ -15,7 +15,7 @@ # limitations under the License. # -from runner.enum_types.base_enum import BaseEnum +from urunner.runner.enum_types.base_enum import BaseEnum class ConfigType(BaseEnum): diff --git a/static_core/tests/tests-u-runner-2/runner/enum_types/configuration_kind.py b/static_core/tests/tests-u-runner-2/urunner/runner/enum_types/configuration_kind.py similarity index 95% rename from static_core/tests/tests-u-runner-2/runner/enum_types/configuration_kind.py rename to static_core/tests/tests-u-runner-2/urunner/runner/enum_types/configuration_kind.py index 0233a7542881c961716a17605e24049ea0fb66db..d2a2331b49766e33a9bcbe91926902c6a96e7058 100644 --- a/static_core/tests/tests-u-runner-2/runner/enum_types/configuration_kind.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/enum_types/configuration_kind.py @@ -15,7 +15,7 @@ # limitations under the License. # -from runner.enum_types.base_enum import BaseEnum +from urunner.runner.enum_types.base_enum import BaseEnum class ConfigurationKind(BaseEnum): diff --git a/static_core/tests/tests-u-runner-2/runner/enum_types/params.py b/static_core/tests/tests-u-runner-2/urunner/runner/enum_types/params.py similarity index 82% rename from static_core/tests/tests-u-runner-2/runner/enum_types/params.py rename to static_core/tests/tests-u-runner-2/urunner/runner/enum_types/params.py index b2580a04cf493763ef70b521a27c04f27b54b522..0e96bea0c1338bb492d943e4a823276ec4db2554 100644 --- a/static_core/tests/tests-u-runner-2/runner/enum_types/params.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/enum_types/params.py @@ -18,10 +18,10 @@ from dataclasses import dataclass from pathlib import Path -from runner.code_coverage.coverage_manager import CoverageManager -from runner.options.config import Config -from runner.reports.report_format import ReportFormat -from runner.suites.work_dir import WorkDir +from urunner.runner.code_coverage.coverage_manager import CoverageManager +from urunner.runner.options.config import Config +from urunner.runner.reports.report_format import ReportFormat +from urunner.runner.suites.work_dir import WorkDir @dataclass diff --git a/static_core/tests/tests-u-runner-2/runner/enum_types/qemu.py b/static_core/tests/tests-u-runner-2/urunner/runner/enum_types/qemu.py similarity index 92% rename from static_core/tests/tests-u-runner-2/runner/enum_types/qemu.py rename to static_core/tests/tests-u-runner-2/urunner/runner/enum_types/qemu.py index 668c0a4c33c37abbc9144ca5b980c503495c1cbe..7a74230630e5761c0498f3e07505ec69bd0e1399 100644 --- a/static_core/tests/tests-u-runner-2/runner/enum_types/qemu.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/enum_types/qemu.py @@ -15,7 +15,7 @@ # limitations under the License. # -from runner.enum_types.base_enum import BaseEnum +from urunner.runner.enum_types.base_enum import BaseEnum class QemuKind(BaseEnum): diff --git a/static_core/tests/tests-u-runner-2/runner/enum_types/verbose_format.py b/static_core/tests/tests-u-runner-2/urunner/runner/enum_types/verbose_format.py similarity index 93% rename from static_core/tests/tests-u-runner-2/runner/enum_types/verbose_format.py rename to static_core/tests/tests-u-runner-2/urunner/runner/enum_types/verbose_format.py index 7a01830e2d6c08e9aecf077697f3195f3076017e..7e93d24d14d324ff9ff33a290e407d86aaf912a0 100644 --- a/static_core/tests/tests-u-runner-2/runner/enum_types/verbose_format.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/enum_types/verbose_format.py @@ -15,7 +15,7 @@ # limitations under the License. # -from runner.enum_types.base_enum import BaseEnum +from urunner.runner.enum_types.base_enum import BaseEnum class VerboseKind(BaseEnum): diff --git a/static_core/tests/tests-u-runner-2/runner/environment.py b/static_core/tests/tests-u-runner-2/urunner/runner/environment.py similarity index 96% rename from static_core/tests/tests-u-runner-2/runner/environment.py rename to static_core/tests/tests-u-runner-2/urunner/runner/environment.py index 779f6d8e4c7fd7c059cf691eb29aa2df3cc2f292..9fc546642f6551732bc2e100fd67eeca7a07cb1b 100644 --- a/static_core/tests/tests-u-runner-2/runner/environment.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/environment.py @@ -21,8 +21,8 @@ from typing import ClassVar, NamedTuple from dotenv import load_dotenv -from runner.init_runner import IsPath, MandatoryProp, MandatoryProps, PropName, RequireExist -from runner.logger import Log +from urunner.runner.init_runner import IsPath, MandatoryProp, MandatoryProps, PropName, RequireExist +from urunner.runner.logger import Log _LOGGER = Log.get_logger(__file__) diff --git a/static_core/tests/tests-u-runner-2/runner/extensions/__init__.py b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/__init__.py similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/extensions/__init__.py rename to static_core/tests/tests-u-runner-2/urunner/runner/extensions/__init__.py diff --git a/static_core/tests/tests-u-runner-2/runner/extensions/flows/__init__.py b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/flows/__init__.py similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/extensions/flows/__init__.py rename to static_core/tests/tests-u-runner-2/urunner/runner/extensions/flows/__init__.py diff --git a/static_core/tests/tests-u-runner-2/runner/extensions/flows/iflow.py b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/flows/iflow.py similarity index 95% rename from static_core/tests/tests-u-runner-2/runner/extensions/flows/iflow.py rename to static_core/tests/tests-u-runner-2/urunner/runner/extensions/flows/iflow.py index c372252c3fa5701161997c9ed1571172a6f55ed8..2e593672dedc294548b9505f475108427dc26097 100644 --- a/static_core/tests/tests-u-runner-2/runner/extensions/flows/iflow.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/flows/iflow.py @@ -16,7 +16,7 @@ from abc import ABC -from runner.logger import Log +from urunner.runner.logger import Log _LOGGER = Log.get_logger(__file__) diff --git a/static_core/tests/tests-u-runner-2/runner/extensions/generators/__init__.py b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/__init__.py similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/extensions/generators/__init__.py rename to static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/__init__.py diff --git a/static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_arkjs_xgc/ark_js_napi_cli_runner.sh b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_arkjs_xgc/ark_js_napi_cli_runner.sh similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_arkjs_xgc/ark_js_napi_cli_runner.sh rename to static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_arkjs_xgc/ark_js_napi_cli_runner.sh diff --git a/static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_arkjs_xgc/ets_arkjs_xgc_generator.py b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_arkjs_xgc/ets_arkjs_xgc_generator.py similarity index 95% rename from static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_arkjs_xgc/ets_arkjs_xgc_generator.py rename to static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_arkjs_xgc/ets_arkjs_xgc_generator.py index 497afbac1633d58c323366a8364689ce5bef836a..e5c5d8e33e79c9e46e61c0b326ddc85339c6660b 100644 --- a/static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_arkjs_xgc/ets_arkjs_xgc_generator.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_arkjs_xgc/ets_arkjs_xgc_generator.py @@ -21,9 +21,9 @@ from pathlib import Path from subprocess import CompletedProcess from typing import cast -from runner.common_exceptions import SetupException -from runner.extensions.generators.igenerator import IGenerator -from runner.logger import Log +from urunner.runner.common_exceptions import SetupException +from urunner.runner.extensions.generators.igenerator import IGenerator +from urunner.runner.logger import Log _LOGGER = Log.get_logger(__file__) diff --git a/static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_cts/__init__.py b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_cts/__init__.py similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_cts/__init__.py rename to static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_cts/__init__.py diff --git a/static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_cts/benchmark.py b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_cts/benchmark.py similarity index 89% rename from static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_cts/benchmark.py rename to static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_cts/benchmark.py index 9d770e3b14795b9b60222e18d3c50f722c547d91..e67da5a34f91dba3186fe23c3f6a524203d8c8df 100644 --- a/static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_cts/benchmark.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_cts/benchmark.py @@ -17,11 +17,11 @@ from pathlib import Path -from runner import common_exceptions -from runner.extensions.generators.ets_cts.params import Params -from runner.extensions.generators.ets_cts.template import Template -from runner.logger import Log -from runner.utils import write_2_file +from urunner.runner import common_exceptions +from urunner.runner.extensions.generators.ets_cts.params import Params +from urunner.runner.extensions.generators.ets_cts.template import Template +from urunner.runner.logger import Log +from urunner.runner.utils import write_2_file _LOGGER = Log.get_logger(__file__) diff --git a/static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_cts/copyright.txt b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_cts/copyright.txt similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_cts/copyright.txt rename to static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_cts/copyright.txt diff --git a/static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_cts/ets_templates_generator.py b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_cts/ets_templates_generator.py similarity index 88% rename from static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_cts/ets_templates_generator.py rename to static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_cts/ets_templates_generator.py index 72b3cb590aca6237d131211c32f83341a77b6020..18ce9769de4876c2d7cd48a6de38df6fd9dc90e1 100644 --- a/static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_cts/ets_templates_generator.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_cts/ets_templates_generator.py @@ -19,10 +19,10 @@ import os import shutil from pathlib import Path -from runner.extensions.generators.ets_cts.benchmark import Benchmark -from runner.extensions.generators.igenerator import IGenerator -from runner.logger import Log -from runner.options.config import Config +from urunner.runner.extensions.generators.ets_cts.benchmark import Benchmark +from urunner.runner.extensions.generators.igenerator import IGenerator +from urunner.runner.logger import Log +from urunner.runner.options.config import Config _LOGGER = Log.get_logger(__file__) diff --git a/static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_cts/params.py b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_cts/params.py similarity index 94% rename from static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_cts/params.py rename to static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_cts/params.py index 08d8f4297fa0b4607926549ab2c55f1c2c96102f..9e6f71270a2c6fcdc9f87f1aca6fee5f35b81dc4 100644 --- a/static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_cts/params.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_cts/params.py @@ -17,7 +17,7 @@ from pathlib import Path -from runner.sts_utils.test_parameters import parse_yaml +from urunner.runner.sts_utils.test_parameters import parse_yaml YAML_EXTENSIONS = ".yaml" PARAM_SUFFIX = ".params" diff --git a/static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_cts/template.py b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_cts/template.py similarity index 94% rename from static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_cts/template.py rename to static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_cts/template.py index 2f11e699ce4d4045420969f922fc8bd405a3aa7a..245322bcacb0fc9a7d172a1a45096f872f6b8887 100644 --- a/static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_cts/template.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_cts/template.py @@ -22,15 +22,19 @@ from pathlib import Path import yaml from jinja2 import Environment, TemplateSyntaxError, select_autoescape -from runner.sts_utils.constants import ( +from urunner.runner.sts_utils.constants import ( META_COPYRIGHT, META_END_COMMENT, META_END_STRING, META_START_COMMENT, META_START_STRING, ) -from runner.sts_utils.exceptions import InvalidFileFormatException, InvalidMetaException, UnknownTemplateException -from runner.utils import read_file +from urunner.runner.sts_utils.exceptions import ( + InvalidFileFormatException, + InvalidMetaException, + UnknownTemplateException, +) +from urunner.runner.utils import read_file ROOT_PATH = Path(os.path.realpath(os.path.dirname(__file__))) BENCH_PATH = ROOT_PATH / "test_template.tpl" diff --git a/static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_cts/test_template.tpl b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_cts/test_template.tpl similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_cts/test_template.tpl rename to static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_cts/test_template.tpl diff --git a/static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_es_checked/__init__.py b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_es_checked/__init__.py similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_es_checked/__init__.py rename to static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_es_checked/__init__.py diff --git a/static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_es_checked/ets_es_checked_generator.py b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_es_checked/ets_es_checked_generator.py similarity index 92% rename from static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_es_checked/ets_es_checked_generator.py rename to static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_es_checked/ets_es_checked_generator.py index fa57ba1db578bbeb3ebcad05f4f05ba87f1c8dca..28868893e85a5ee4e5c8f3e9d24a90a3b185ee3a 100644 --- a/static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_es_checked/ets_es_checked_generator.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_es_checked/ets_es_checked_generator.py @@ -20,9 +20,9 @@ from glob import glob from os import path from pathlib import Path -from runner.common_exceptions import SetupException -from runner.extensions.generators.igenerator import IGenerator -from runner.logger import Log +from urunner.runner.common_exceptions import SetupException +from urunner.runner.extensions.generators.igenerator import IGenerator +from urunner.runner.logger import Log _LOGGER = Log.get_logger(__file__) diff --git a/static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_es_checked/generate-es-checked/.gitignore b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_es_checked/generate-es-checked/.gitignore similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_es_checked/generate-es-checked/.gitignore rename to static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_es_checked/generate-es-checked/.gitignore diff --git a/static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_es_checked/generate-es-checked/README.md b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_es_checked/generate-es-checked/README.md similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_es_checked/generate-es-checked/README.md rename to static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_es_checked/generate-es-checked/README.md diff --git a/static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_es_checked/generate-es-checked/main.rb b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_es_checked/generate-es-checked/main.rb similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_es_checked/generate-es-checked/main.rb rename to static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_es_checked/generate-es-checked/main.rb diff --git a/static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_es_checked/generate-es-checked/package.json b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_es_checked/generate-es-checked/package.json similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_es_checked/generate-es-checked/package.json rename to static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_es_checked/generate-es-checked/package.json diff --git a/static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_es_checked/generate-es-checked/src/script_module.rb b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_es_checked/generate-es-checked/src/script_module.rb similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_es_checked/generate-es-checked/src/script_module.rb rename to static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_es_checked/generate-es-checked/src/script_module.rb diff --git a/static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_es_checked/generate-es-checked/src/types.rb b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_es_checked/generate-es-checked/src/types.rb similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_es_checked/generate-es-checked/src/types.rb rename to static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_es_checked/generate-es-checked/src/types.rb diff --git a/static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_es_checked/generate-es-checked/src/value_dumper.rb b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_es_checked/generate-es-checked/src/value_dumper.rb similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_es_checked/generate-es-checked/src/value_dumper.rb rename to static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_es_checked/generate-es-checked/src/value_dumper.rb diff --git a/static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_es_checked/generate-es-checked/templates/template.sts.erb b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_es_checked/generate-es-checked/templates/template.sts.erb similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_es_checked/generate-es-checked/templates/template.sts.erb rename to static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_es_checked/generate-es-checked/templates/template.sts.erb diff --git a/static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_es_checked/generate-es-checked/templates/template.ts.erb b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_es_checked/generate-es-checked/templates/template.ts.erb similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_es_checked/generate-es-checked/templates/template.ts.erb rename to static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_es_checked/generate-es-checked/templates/template.ts.erb diff --git a/static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_es_checked/generate-es-checked/tsconfig.json b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_es_checked/generate-es-checked/tsconfig.json similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/extensions/generators/ets_es_checked/generate-es-checked/tsconfig.json rename to static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/ets_es_checked/generate-es-checked/tsconfig.json diff --git a/static_core/tests/tests-u-runner-2/runner/extensions/generators/hermes/__init__.py b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/hermes/__init__.py similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/extensions/generators/hermes/__init__.py rename to static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/hermes/__init__.py diff --git a/static_core/tests/tests-u-runner-2/runner/extensions/generators/hermes/hermes_generator.py b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/hermes/hermes_generator.py similarity index 94% rename from static_core/tests/tests-u-runner-2/runner/extensions/generators/hermes/hermes_generator.py rename to static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/hermes/hermes_generator.py index 5146a6a7621850cf322cc51f851eddfd018885e9..284e6cc27030323437c720de5b949d863cf76003 100644 --- a/static_core/tests/tests-u-runner-2/runner/extensions/generators/hermes/hermes_generator.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/hermes/hermes_generator.py @@ -23,11 +23,11 @@ from os import makedirs, path from pathlib import Path from typing import cast -from runner.common_exceptions import InvalidConfiguration, RunnerException -from runner.extensions.generators.igenerator import IGenerator -from runner.logger import Log -from runner.options.config import Config -from runner.utils import download_and_generate +from urunner.runner.common_exceptions import InvalidConfiguration, RunnerException +from urunner.runner.extensions.generators.igenerator import IGenerator +from urunner.runner.logger import Log +from urunner.runner.options.config import Config +from urunner.runner.utils import download_and_generate _LOGGER = Log.get_logger(__file__) diff --git a/static_core/tests/tests-u-runner-2/runner/extensions/generators/igenerator.py b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/igenerator.py similarity index 88% rename from static_core/tests/tests-u-runner-2/runner/extensions/generators/igenerator.py rename to static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/igenerator.py index 70c751bc532fcc1667ed84355f851913a7acf934..a68b4b54093243448121215cb7fd85c5edb08b37 100644 --- a/static_core/tests/tests-u-runner-2/runner/extensions/generators/igenerator.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/igenerator.py @@ -17,9 +17,9 @@ from abc import ABC, abstractmethod from pathlib import Path -from runner.common_exceptions import InvalidConfiguration -from runner.logger import Log -from runner.options.config import Config +from urunner.runner.common_exceptions import InvalidConfiguration +from urunner.runner.logger import Log +from urunner.runner.options.config import Config _LOGGER = Log.get_logger(__file__) diff --git a/static_core/tests/tests-u-runner-2/runner/extensions/generators/sts_stdlib/__init__.py b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/sts_stdlib/__init__.py similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/extensions/generators/sts_stdlib/__init__.py rename to static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/sts_stdlib/__init__.py diff --git a/static_core/tests/tests-u-runner-2/runner/extensions/generators/sts_stdlib/stdlib_templates_generator.py b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/sts_stdlib/stdlib_templates_generator.py similarity index 88% rename from static_core/tests/tests-u-runner-2/runner/extensions/generators/sts_stdlib/stdlib_templates_generator.py rename to static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/sts_stdlib/stdlib_templates_generator.py index b1f00f32ee1a5a5f97c4ff1ebc38e06e36a96a3f..c73dd7e25ec7b7e5ef5cde9ad32e337597626e8f 100644 --- a/static_core/tests/tests-u-runner-2/runner/extensions/generators/sts_stdlib/stdlib_templates_generator.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/sts_stdlib/stdlib_templates_generator.py @@ -20,16 +20,16 @@ from pathlib import Path from jinja2 import Environment, FileSystemLoader, TemplateSyntaxError, select_autoescape -from runner import common_exceptions -from runner.extensions.generators.igenerator import IGenerator -from runner.logger import Log -from runner.options.config import Config -from runner.sts_utils.constants import OUT_EXTENSION, SKIP_PREFIX, TEMPLATE_EXTENSION, VARIABLE_START_STRING -from runner.sts_utils.exceptions import InvalidFileFormatException, UnknownTemplateException -from runner.sts_utils.file_structure import walk_test_subdirs -from runner.sts_utils.metainformation import InvalidMetaException, find_all_metas -from runner.sts_utils.test_parameters import load_params -from runner.utils import iter_files, write_2_file +from urunner.runner import common_exceptions +from urunner.runner.extensions.generators.igenerator import IGenerator +from urunner.runner.logger import Log +from urunner.runner.options.config import Config +from urunner.runner.sts_utils.constants import OUT_EXTENSION, SKIP_PREFIX, TEMPLATE_EXTENSION, VARIABLE_START_STRING +from urunner.runner.sts_utils.exceptions import InvalidFileFormatException, UnknownTemplateException +from urunner.runner.sts_utils.file_structure import walk_test_subdirs +from urunner.runner.sts_utils.metainformation import InvalidMetaException, find_all_metas +from urunner.runner.sts_utils.test_parameters import load_params +from urunner.runner.utils import iter_files, write_2_file _LOGGER = Log.get_logger(__file__) diff --git a/static_core/tests/tests-u-runner-2/runner/extensions/generators/test262/__init__.py b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/test262/__init__.py similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/extensions/generators/test262/__init__.py rename to static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/test262/__init__.py diff --git a/static_core/tests/tests-u-runner-2/runner/extensions/generators/test262/test262_generator.py b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/test262/test262_generator.py similarity index 95% rename from static_core/tests/tests-u-runner-2/runner/extensions/generators/test262/test262_generator.py rename to static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/test262/test262_generator.py index 4b6e7d07bf1e1e2f11c3900b2f2d80c23aaba71e..a2e1dc5eb0cfa6dcae3ab3fd280934f173462ab2 100755 --- a/static_core/tests/tests-u-runner-2/runner/extensions/generators/test262/test262_generator.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/test262/test262_generator.py @@ -20,12 +20,12 @@ from os import makedirs, path from pathlib import Path from typing import Any -from runner.common_exceptions import InvalidConfiguration -from runner.descriptor import Descriptor -from runner.extensions.generators.igenerator import IGenerator -from runner.logger import Log -from runner.options.config import Config -from runner.utils import download_and_generate +from urunner.runner.common_exceptions import InvalidConfiguration +from urunner.runner.descriptor import Descriptor +from urunner.runner.extensions.generators.igenerator import IGenerator +from urunner.runner.logger import Log +from urunner.runner.options.config import Config +from urunner.runner.utils import download_and_generate _LOGGER = Log.get_logger(__file__) diff --git a/static_core/tests/tests-u-runner-2/runner/extensions/generators/test262/test262harness.js b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/test262/test262harness.js similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/extensions/generators/test262/test262harness.js rename to static_core/tests/tests-u-runner-2/urunner/runner/extensions/generators/test262/test262harness.js diff --git a/static_core/tests/tests-u-runner-2/runner/extensions/steps/__init__.py b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/steps/__init__.py similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/extensions/steps/__init__.py rename to static_core/tests/tests-u-runner-2/urunner/runner/extensions/steps/__init__.py diff --git a/static_core/tests/tests-u-runner-2/runner/extensions/steps/jit_transformer.py b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/steps/jit_transformer.py similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/extensions/steps/jit_transformer.py rename to static_core/tests/tests-u-runner-2/urunner/runner/extensions/steps/jit_transformer.py diff --git a/static_core/tests/tests-u-runner-2/runner/extensions/validators/__init__.py b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/validators/__init__.py similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/extensions/validators/__init__.py rename to static_core/tests/tests-u-runner-2/urunner/runner/extensions/validators/__init__.py diff --git a/static_core/tests/tests-u-runner-2/runner/extensions/validators/astchecker/__init__.py b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/validators/astchecker/__init__.py similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/extensions/validators/astchecker/__init__.py rename to static_core/tests/tests-u-runner-2/urunner/runner/extensions/validators/astchecker/__init__.py diff --git a/static_core/tests/tests-u-runner-2/runner/extensions/validators/astchecker/astchecker_validator.py b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/validators/astchecker/astchecker_validator.py similarity index 90% rename from static_core/tests/tests-u-runner-2/runner/extensions/validators/astchecker/astchecker_validator.py rename to static_core/tests/tests-u-runner-2/urunner/runner/extensions/validators/astchecker/astchecker_validator.py index cac3f368e93342364d7890b3a0f4d269eb6e7751..84e093fb0039f162685cdee548ba222b6b411493 100644 --- a/static_core/tests/tests-u-runner-2/runner/extensions/validators/astchecker/astchecker_validator.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/validators/astchecker/astchecker_validator.py @@ -18,12 +18,12 @@ import json from json import JSONDecodeError, JSONDecoder -from runner import common_exceptions, utils -from runner.extensions.validators.astchecker.util_astchecker import UtilASTChecker -from runner.extensions.validators.base_validator import BaseValidator -from runner.logger import Log -from runner.options.step import StepKind -from runner.suites.test_standard_flow import TestStandardFlow +from urunner.runner import common_exceptions, utils +from urunner.runner.extensions.validators.astchecker.util_astchecker import UtilASTChecker +from urunner.runner.extensions.validators.base_validator import BaseValidator +from urunner.runner.logger import Log +from urunner.runner.options.step import StepKind +from urunner.runner.suites.test_standard_flow import TestStandardFlow _LOGGER = Log.get_logger(__file__) diff --git a/static_core/tests/tests-u-runner-2/runner/extensions/validators/astchecker/util_astchecker.py b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/validators/astchecker/util_astchecker.py similarity index 99% rename from static_core/tests/tests-u-runner-2/runner/extensions/validators/astchecker/util_astchecker.py rename to static_core/tests/tests-u-runner-2/urunner/runner/extensions/validators/astchecker/util_astchecker.py index 66fe02b1c47b5df433f5e24c6350bbabb3e62b41..73ab7e85e3d5c038f2cc25fe332e4e586c2ddd1d 100644 --- a/static_core/tests/tests-u-runner-2/runner/extensions/validators/astchecker/util_astchecker.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/validators/astchecker/util_astchecker.py @@ -24,8 +24,8 @@ from enum import Enum from pathlib import Path from typing import ClassVar -from runner.common_exceptions import RunnerException -from runner.logger import Log +from urunner.runner.common_exceptions import RunnerException +from urunner.runner.logger import Log _LOGGER = Log.get_logger(__file__) AstCheckerError = tuple[str, str] diff --git a/static_core/tests/tests-u-runner-2/runner/extensions/validators/base_validator.py b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/validators/base_validator.py similarity index 88% rename from static_core/tests/tests-u-runner-2/runner/extensions/validators/base_validator.py rename to static_core/tests/tests-u-runner-2/urunner/runner/extensions/validators/base_validator.py index 8f0f5625123525d7f708a190403de8ec8f49b6a1..e6ba56dfeaa15ae4eaa6b2bdf5d577cb6e943ec5 100644 --- a/static_core/tests/tests-u-runner-2/runner/extensions/validators/base_validator.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/validators/base_validator.py @@ -14,9 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from runner.extensions.validators.ivalidator import IValidator -from runner.logger import Log -from runner.options.step import StepKind +from urunner.runner.extensions.validators.ivalidator import IValidator +from urunner.runner.logger import Log +from urunner.runner.options.step import StepKind _LOGGER = Log.get_logger(__file__) diff --git a/static_core/tests/tests-u-runner-2/runner/extensions/validators/ivalidator.py b/static_core/tests/tests-u-runner-2/urunner/runner/extensions/validators/ivalidator.py similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/extensions/validators/ivalidator.py rename to static_core/tests/tests-u-runner-2/urunner/runner/extensions/validators/ivalidator.py diff --git a/static_core/tests/tests-u-runner-2/runner/init_runner.py b/static_core/tests/tests-u-runner-2/urunner/runner/init_runner.py similarity index 98% rename from static_core/tests/tests-u-runner-2/runner/init_runner.py rename to static_core/tests/tests-u-runner-2/urunner/runner/init_runner.py index 9ec30525f99234d76d8a2f3daf3055ae4a05f4d4..0da79c1e70919bf91ca2b2067130611084b8493c 100644 --- a/static_core/tests/tests-u-runner-2/runner/init_runner.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/init_runner.py @@ -20,8 +20,8 @@ from collections.abc import Callable from pathlib import Path from typing import ClassVar, NamedTuple -from runner.common_exceptions import FileNotFoundException -from runner.utils import write_2_file +from urunner.runner.common_exceptions import FileNotFoundException +from urunner.runner.utils import write_2_file Str2Path = Callable[[str], Path] diff --git a/static_core/tests/tests-u-runner-2/runner/logger.py b/static_core/tests/tests-u-runner-2/urunner/runner/logger.py similarity index 97% rename from static_core/tests/tests-u-runner-2/runner/logger.py rename to static_core/tests/tests-u-runner-2/urunner/runner/logger.py index 966e1965d664ad5a6cbe01e841d4b5c9fa74a4e1..480c5c05025a5b110e2ae9ce96635790bf0324dc 100644 --- a/static_core/tests/tests-u-runner-2/runner/logger.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/logger.py @@ -19,7 +19,7 @@ import logging from os import makedirs, path from pathlib import Path -from runner.enum_types.verbose_format import VerboseKind +from urunner.runner.enum_types.verbose_format import VerboseKind SUMMARY_LOG_LEVEL = 21 NONE_LOG_LEVEL = 22 diff --git a/static_core/tests/tests-u-runner-2/runner/options/__init__.py b/static_core/tests/tests-u-runner-2/urunner/runner/options/__init__.py similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/options/__init__.py rename to static_core/tests/tests-u-runner-2/urunner/runner/options/__init__.py diff --git a/static_core/tests/tests-u-runner-2/runner/options/cli_args_wrapper.py b/static_core/tests/tests-u-runner-2/urunner/runner/options/cli_args_wrapper.py similarity index 96% rename from static_core/tests/tests-u-runner-2/runner/options/cli_args_wrapper.py rename to static_core/tests/tests-u-runner-2/urunner/runner/options/cli_args_wrapper.py index 14198b6030e8ac3dfcc78ff35e48456de2719ca8..8d0e08f0fdfe3b616bb357bd5a9ce92381576a1a 100644 --- a/static_core/tests/tests-u-runner-2/runner/options/cli_args_wrapper.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/options/cli_args_wrapper.py @@ -17,7 +17,7 @@ from typing import Any -from runner.logger import Log +from urunner.runner.logger import Log _LOGGER = Log.get_logger(__file__) diff --git a/static_core/tests/tests-u-runner-2/runner/options/cli_options.py b/static_core/tests/tests-u-runner-2/urunner/runner/options/cli_options.py similarity index 97% rename from static_core/tests/tests-u-runner-2/runner/options/cli_options.py rename to static_core/tests/tests-u-runner-2/urunner/runner/options/cli_options.py index b8d2f9c5e2f73acb40907f404ff159ad01a51a1c..9775dd27e2dd8acd9c8acf1e4cd4e59fbf5e863c 100644 --- a/static_core/tests/tests-u-runner-2/runner/options/cli_options.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/options/cli_options.py @@ -19,14 +19,14 @@ from glob import glob from pathlib import Path from typing import Any, cast -from runner import utils -from runner.common_exceptions import FileNotFoundException, IncorrectEnumValue, InvalidConfiguration -from runner.enum_types.config_type import ConfigType -from runner.logger import Log -from runner.options import cli_options_utils as cli_utils -from runner.options.cli_options_utils import CliOptionsConsts -from runner.options.options_general import GeneralOptions -from runner.options.options_test_suite import TestSuiteOptions +from urunner.runner import utils +from urunner.runner.common_exceptions import FileNotFoundException, IncorrectEnumValue, InvalidConfiguration +from urunner.runner.enum_types.config_type import ConfigType +from urunner.runner.logger import Log +from urunner.runner.options import cli_options_utils as cli_utils +from urunner.runner.options.cli_options_utils import CliOptionsConsts +from urunner.runner.options.options_general import GeneralOptions +from urunner.runner.options.options_test_suite import TestSuiteOptions _LOGGER = Log.get_logger(__file__) diff --git a/static_core/tests/tests-u-runner-2/runner/options/cli_options_utils.py b/static_core/tests/tests-u-runner-2/urunner/runner/options/cli_options_utils.py similarity index 95% rename from static_core/tests/tests-u-runner-2/runner/options/cli_options_utils.py rename to static_core/tests/tests-u-runner-2/urunner/runner/options/cli_options_utils.py index c69c9a8870aeb7bf4d042c886a675cc00a90d589..a5c9bd0e44fe6f990754f61f5ef9b9d5bd2453d9 100644 --- a/static_core/tests/tests-u-runner-2/runner/options/cli_options_utils.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/options/cli_options_utils.py @@ -18,12 +18,12 @@ from collections.abc import Generator from pathlib import Path from typing import TYPE_CHECKING, Any, NewType, cast -from runner import utils -from runner.common_exceptions import InvalidConfiguration -from runner.enum_types.base_enum import BaseEnum +from urunner.runner import utils +from urunner.runner.common_exceptions import InvalidConfiguration +from urunner.runner.enum_types.base_enum import BaseEnum if TYPE_CHECKING: - from runner.options.cli_options import ConfigsLoader + from urunner.runner.options.cli_options import ConfigsLoader ConfigPropertyType = Any # type: ignore[explicit-any] WorkflowName = NewType('WorkflowName', str) diff --git a/static_core/tests/tests-u-runner-2/runner/options/config.py b/static_core/tests/tests-u-runner-2/urunner/runner/options/config.py similarity index 79% rename from static_core/tests/tests-u-runner-2/runner/options/config.py rename to static_core/tests/tests-u-runner-2/urunner/runner/options/config.py index 6298da29a355f1c978e0ee2e758d778bf8b40098..f7e8b0c8b17270b946f9a14a5f6b72f5dbf15b1e 100644 --- a/static_core/tests/tests-u-runner-2/runner/options/config.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/options/config.py @@ -18,12 +18,12 @@ import re from typing import Any -from runner.logger import Log -from runner.options.cli_args_wrapper import CliArgsWrapper -from runner.options.options import IOptions -from runner.options.options_general import GeneralOptions -from runner.options.options_test_suite import TestSuiteOptions -from runner.options.options_workflow import WorkflowOptions +from urunner.runner.logger import Log +from urunner.runner.options.cli_args_wrapper import CliArgsWrapper +from urunner.runner.options.options import IOptions +from urunner.runner.options.options_general import GeneralOptions +from urunner.runner.options.options_test_suite import TestSuiteOptions +from urunner.runner.options.options_workflow import WorkflowOptions _LOGGER = Log.get_logger(__file__) diff --git a/static_core/tests/tests-u-runner-2/runner/options/local_env.py b/static_core/tests/tests-u-runner-2/urunner/runner/options/local_env.py similarity index 94% rename from static_core/tests/tests-u-runner-2/runner/options/local_env.py rename to static_core/tests/tests-u-runner-2/urunner/runner/options/local_env.py index 454f5f2c1f36dd2fb1f751951fbdf5869cadd7b8..af06b554e643ca65c50319a3082ba7be35fb6e5a 100644 --- a/static_core/tests/tests-u-runner-2/runner/options/local_env.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/options/local_env.py @@ -17,8 +17,8 @@ from threading import main_thread from typing import ClassVar -from runner.common_exceptions import InvalidConfiguration -from runner.logger import Log +from urunner.runner.common_exceptions import InvalidConfiguration +from urunner.runner.logger import Log _LOGGER = Log.get_logger(__file__) diff --git a/static_core/tests/tests-u-runner-2/runner/options/macros.py b/static_core/tests/tests-u-runner-2/urunner/runner/options/macros.py similarity index 93% rename from static_core/tests/tests-u-runner-2/runner/options/macros.py rename to static_core/tests/tests-u-runner-2/urunner/runner/options/macros.py index 51f09190e6ada6747b4133e88c9a9517d51ef4c3..ea49223463ed09a58c29e37027e6dd7b3185c858 100644 --- a/static_core/tests/tests-u-runner-2/runner/options/macros.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/options/macros.py @@ -17,11 +17,11 @@ from os import environ -from runner.common_exceptions import MacroNotExpanded, ParameterNotFound -from runner.logger import Log -from runner.options.local_env import LocalEnv -from runner.options.options import IOptions -from runner.utils import expand_file_name, get_all_macros, has_macro, replace_macro +from urunner.runner.common_exceptions import MacroNotExpanded, ParameterNotFound +from urunner.runner.logger import Log +from urunner.runner.options.local_env import LocalEnv +from urunner.runner.options.options import IOptions +from urunner.runner.utils import expand_file_name, get_all_macros, has_macro, replace_macro _LOGGER = Log.get_logger(__file__) diff --git a/static_core/tests/tests-u-runner-2/runner/options/options.py b/static_core/tests/tests-u-runner-2/urunner/runner/options/options.py similarity index 96% rename from static_core/tests/tests-u-runner-2/runner/options/options.py rename to static_core/tests/tests-u-runner-2/urunner/runner/options/options.py index 1ae193a55a1aba99a68a2d486d79834d15d5162b..c2b1a7418a81fb5994788f484494b9b863f63d57 100644 --- a/static_core/tests/tests-u-runner-2/runner/options/options.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/options/options.py @@ -18,9 +18,9 @@ from abc import ABC from typing import Any, Optional -from runner.logger import Log -from runner.utils import convert_minus, convert_underscore, is_type_of -from runner.utils import indent as utils_indent +from urunner.runner.logger import Log +from urunner.runner.utils import convert_minus, convert_underscore, is_type_of +from urunner.runner.utils import indent as utils_indent _LOGGER = Log.get_logger(__file__) diff --git a/static_core/tests/tests-u-runner-2/runner/options/options_collections.py b/static_core/tests/tests-u-runner-2/urunner/runner/options/options_collections.py similarity index 94% rename from static_core/tests/tests-u-runner-2/runner/options/options_collections.py rename to static_core/tests/tests-u-runner-2/urunner/runner/options/options_collections.py index f09f8b7b2be77806a6090784b08230c386d223af..3ae089995e7638cfe3158aa985b03c91574bbcab 100644 --- a/static_core/tests/tests-u-runner-2/runner/options/options_collections.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/options/options_collections.py @@ -19,11 +19,11 @@ from functools import cached_property from pathlib import Path from typing import Any, cast -from runner import utils -from runner.common_exceptions import InvalidConfiguration -from runner.logger import Log -from runner.options.macros import Macros, ParameterNotFound -from runner.options.options import IOptions +from urunner.runner import utils +from urunner.runner.common_exceptions import InvalidConfiguration +from urunner.runner.logger import Log +from urunner.runner.options.macros import Macros, ParameterNotFound +from urunner.runner.options.options import IOptions _LOGGER = Log.get_logger(__file__) diff --git a/static_core/tests/tests-u-runner-2/runner/options/options_coverage.py b/static_core/tests/tests-u-runner-2/urunner/runner/options/options_coverage.py similarity index 98% rename from static_core/tests/tests-u-runner-2/runner/options/options_coverage.py rename to static_core/tests/tests-u-runner-2/urunner/runner/options/options_coverage.py index 713427411010ffc100e807143622207db6d49736..48058332cac1529fca5d3c63749ba7347495c86e 100644 --- a/static_core/tests/tests-u-runner-2/runner/options/options_coverage.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/options/options_coverage.py @@ -20,8 +20,8 @@ from functools import cached_property from pathlib import Path from typing import Any, cast -from runner.options.options import IOptions -from runner.utils import make_dir_if_not_exist +from urunner.runner.options.options import IOptions +from urunner.runner.utils import make_dir_if_not_exist USE_LLVM_COV = "use-llvm-cov" USE_LCOV = "use-lcov" diff --git a/static_core/tests/tests-u-runner-2/runner/options/options_ets.py b/static_core/tests/tests-u-runner-2/urunner/runner/options/options_ets.py similarity index 96% rename from static_core/tests/tests-u-runner-2/runner/options/options_ets.py rename to static_core/tests/tests-u-runner-2/urunner/runner/options/options_ets.py index 2b04a8c1d00d4a433bfafb774364c3652645bf09..0136b938e62f5f79927ae47b5c7b180edf000374 100644 --- a/static_core/tests/tests-u-runner-2/runner/options/options_ets.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/options/options_ets.py @@ -19,8 +19,8 @@ import argparse from functools import cached_property from typing import Any -from runner.enum_types.base_enum import BaseEnum -from runner.options.options import IOptions +from urunner.runner.enum_types.base_enum import BaseEnum +from urunner.runner.options.options import IOptions class ETSOptionsConsts(BaseEnum): diff --git a/static_core/tests/tests-u-runner-2/runner/options/options_general.py b/static_core/tests/tests-u-runner-2/urunner/runner/options/options_general.py similarity index 93% rename from static_core/tests/tests-u-runner-2/runner/options/options_general.py rename to static_core/tests/tests-u-runner-2/urunner/runner/options/options_general.py index a937cfc03c9aad56daea4cd64742e25295df1e9c..fdafd3b7a0671d49b0001f56665504ec2d408913 100644 --- a/static_core/tests/tests-u-runner-2/runner/options/options_general.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/options/options_general.py @@ -20,16 +20,16 @@ from functools import cached_property from pathlib import Path from typing import Any, cast -from runner.common_exceptions import InvalidConfiguration -from runner.enum_types.qemu import QemuKind -from runner.enum_types.verbose_format import VerboseFilter, VerboseKind -from runner.options.macros import Macros -from runner.options.options import IOptions -from runner.options.options_coverage import CoverageOptions -from runner.options.options_report import ReportOptions -from runner.options.options_time_report import TimeReportOptions -from runner.reports.report_format import ReportFormat -from runner.utils import convert_underscore +from urunner.runner.common_exceptions import InvalidConfiguration +from urunner.runner.enum_types.qemu import QemuKind +from urunner.runner.enum_types.verbose_format import VerboseFilter, VerboseKind +from urunner.runner.options.macros import Macros +from urunner.runner.options.options import IOptions +from urunner.runner.options.options_coverage import CoverageOptions +from urunner.runner.options.options_report import ReportOptions +from urunner.runner.options.options_time_report import TimeReportOptions +from urunner.runner.reports.report_format import ReportFormat +from urunner.runner.utils import convert_underscore class GeneralOptions(IOptions): diff --git a/static_core/tests/tests-u-runner-2/runner/options/options_groups.py b/static_core/tests/tests-u-runner-2/urunner/runner/options/options_groups.py similarity index 97% rename from static_core/tests/tests-u-runner-2/runner/options/options_groups.py rename to static_core/tests/tests-u-runner-2/urunner/runner/options/options_groups.py index 408456122211a6e338cd2a3e51187d275a755e85..ba86b7941371b33056c383b2a86eb9895ea682a6 100644 --- a/static_core/tests/tests-u-runner-2/runner/options/options_groups.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/options/options_groups.py @@ -20,8 +20,8 @@ from functools import cached_property from pathlib import Path from typing import Any -from runner.options.options import IOptions -from runner.utils import check_int, is_file +from urunner.runner.options.options import IOptions +from urunner.runner.utils import check_int, is_file class GroupsOptions(IOptions): diff --git a/static_core/tests/tests-u-runner-2/runner/options/options_report.py b/static_core/tests/tests-u-runner-2/urunner/runner/options/options_report.py similarity index 98% rename from static_core/tests/tests-u-runner-2/runner/options/options_report.py rename to static_core/tests/tests-u-runner-2/urunner/runner/options/options_report.py index 9d9514ff8baad2783d4e50e9ac4e8b483bf83a9d..79940d06736ff48768a3b57d4049bccf441b8b6b 100644 --- a/static_core/tests/tests-u-runner-2/runner/options/options_report.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/options/options_report.py @@ -19,7 +19,7 @@ import argparse import enum -from runner.options.options import IOptions +from urunner.runner.options.options import IOptions class ReportOptionsDefaults(enum.Enum): diff --git a/static_core/tests/tests-u-runner-2/runner/options/options_test_lists.py b/static_core/tests/tests-u-runner-2/urunner/runner/options/options_test_lists.py similarity index 97% rename from static_core/tests/tests-u-runner-2/runner/options/options_test_lists.py rename to static_core/tests/tests-u-runner-2/urunner/runner/options/options_test_lists.py index 39e6a9c1e0bf3197e2f2d1a5ae4218007f87cc9b..1758021fa1cc536cd4fe661699cb0fe004c48015 100644 --- a/static_core/tests/tests-u-runner-2/runner/options/options_test_lists.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/options/options_test_lists.py @@ -19,8 +19,8 @@ import argparse from functools import cached_property from typing import Any, cast -from runner.enum_types.configuration_kind import ArchitectureKind, BuildTypeKind, OSKind, SanitizerKind -from runner.options.options import IOptions +from urunner.runner.enum_types.configuration_kind import ArchitectureKind, BuildTypeKind, OSKind, SanitizerKind +from urunner.runner.options.options import IOptions class TestListsOptions(IOptions): diff --git a/static_core/tests/tests-u-runner-2/runner/options/options_test_suite.py b/static_core/tests/tests-u-runner-2/urunner/runner/options/options_test_suite.py similarity index 93% rename from static_core/tests/tests-u-runner-2/runner/options/options_test_suite.py rename to static_core/tests/tests-u-runner-2/urunner/runner/options/options_test_suite.py index 88377febff56023d5d1ad5e859e1e22f1ef87f5d..82235efd9fb6b6535b6804efb2cb257d5b72913e 100644 --- a/static_core/tests/tests-u-runner-2/runner/options/options_test_suite.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/options/options_test_suite.py @@ -20,16 +20,16 @@ from functools import cached_property from pathlib import Path from typing import Any, cast -from runner.common_exceptions import InvalidConfiguration -from runner.logger import Log -from runner.options.macros import Macros, ParameterNotFound -from runner.options.options import IOptions -from runner.options.options_collections import CollectionsOptions -from runner.options.options_ets import ETSOptions -from runner.options.options_general import GeneralOptions -from runner.options.options_groups import GroupsOptions -from runner.options.options_test_lists import TestListsOptions -from runner.utils import check_int, convert_underscore, extract_parameter_name +from urunner.runner.common_exceptions import InvalidConfiguration +from urunner.runner.logger import Log +from urunner.runner.options.macros import Macros, ParameterNotFound +from urunner.runner.options.options import IOptions +from urunner.runner.options.options_collections import CollectionsOptions +from urunner.runner.options.options_ets import ETSOptions +from urunner.runner.options.options_general import GeneralOptions +from urunner.runner.options.options_groups import GroupsOptions +from urunner.runner.options.options_test_lists import TestListsOptions +from urunner.runner.utils import check_int, convert_underscore, extract_parameter_name _LOGGER = Log.get_logger(__file__) diff --git a/static_core/tests/tests-u-runner-2/runner/options/options_time_report.py b/static_core/tests/tests-u-runner-2/urunner/runner/options/options_time_report.py similarity index 97% rename from static_core/tests/tests-u-runner-2/runner/options/options_time_report.py rename to static_core/tests/tests-u-runner-2/urunner/runner/options/options_time_report.py index b40aec33262105269fda93a35be93714d0eb88ce..8b6742f1a002a426a171c4691814bf9e0e75e5cd 100644 --- a/static_core/tests/tests-u-runner-2/runner/options/options_time_report.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/options/options_time_report.py @@ -19,7 +19,7 @@ import argparse from functools import cached_property from typing import Any, ClassVar -from runner.options.options import IOptions +from urunner.runner.options.options import IOptions class TimeReportOptions(IOptions): diff --git a/static_core/tests/tests-u-runner-2/runner/options/options_workflow.py b/static_core/tests/tests-u-runner-2/urunner/runner/options/options_workflow.py similarity index 95% rename from static_core/tests/tests-u-runner-2/runner/options/options_workflow.py rename to static_core/tests/tests-u-runner-2/urunner/runner/options/options_workflow.py index 3da1c453ec81c44c0d3c746883a0e9573badae6f..861d2215506b0865f7023cb2418b761d8c2af2c8 100644 --- a/static_core/tests/tests-u-runner-2/runner/options/options_workflow.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/options/options_workflow.py @@ -19,14 +19,14 @@ from functools import cached_property from os import path from typing import Any, Optional, cast -from runner.common_exceptions import FileNotFoundException, InvalidConfiguration -from runner.logger import Log -from runner.options.macros import MacroNotExpanded, Macros, ParameterNotFound -from runner.options.options import IOptions -from runner.options.options_test_suite import TestSuiteOptions -from runner.options.step import Step, StepKind -from runner.utils import get_config_workflow_folder, has_macro, load_config -from runner.utils import indent as utils_indent +from urunner.runner.common_exceptions import FileNotFoundException, InvalidConfiguration +from urunner.runner.logger import Log +from urunner.runner.options.macros import MacroNotExpanded, Macros, ParameterNotFound +from urunner.runner.options.options import IOptions +from urunner.runner.options.options_test_suite import TestSuiteOptions +from urunner.runner.options.step import Step, StepKind +from urunner.runner.utils import get_config_workflow_folder, has_macro, load_config +from urunner.runner.utils import indent as utils_indent _LOGGER = Log.get_logger(__file__) diff --git a/static_core/tests/tests-u-runner-2/runner/options/step.py b/static_core/tests/tests-u-runner-2/urunner/runner/options/step.py similarity index 96% rename from static_core/tests/tests-u-runner-2/runner/options/step.py rename to static_core/tests/tests-u-runner-2/urunner/runner/options/step.py index ecfc6f4154d0d74ec2a9df47693b5eb2166ccd64..ebf0396504d1d75b42e9a80bdbe13d4e29655e26 100644 --- a/static_core/tests/tests-u-runner-2/runner/options/step.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/options/step.py @@ -19,12 +19,16 @@ from dataclasses import dataclass from pathlib import Path from typing import Any, cast -from runner import utils -from runner.common_exceptions import FileNotFoundException, IncorrectEnumValue, MalformedStepConfigurationException -from runner.enum_types.base_enum import BaseEnum -from runner.logger import Log -from runner.options.options import IOptions -from runner.utils import to_bool +from urunner.runner import utils +from urunner.runner.common_exceptions import ( + FileNotFoundException, + IncorrectEnumValue, + MalformedStepConfigurationException, +) +from urunner.runner.enum_types.base_enum import BaseEnum +from urunner.runner.logger import Log +from urunner.runner.options.options import IOptions +from urunner.runner.utils import to_bool _LOGGER = Log.get_logger(__file__) diff --git a/static_core/tests/tests-u-runner-2/runner/options/yaml_document.py b/static_core/tests/tests-u-runner-2/urunner/runner/options/yaml_document.py similarity index 95% rename from static_core/tests/tests-u-runner-2/runner/options/yaml_document.py rename to static_core/tests/tests-u-runner-2/urunner/runner/options/yaml_document.py index d7082b3a904c1e47a0bdfb5ea0f3b7575b350fe1..80c0b8e176a55a49697ba842a77ec36d73b7a86e 100644 --- a/static_core/tests/tests-u-runner-2/runner/options/yaml_document.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/options/yaml_document.py @@ -20,8 +20,8 @@ from typing import Any import yaml -from runner import utils -from runner.logger import Log +from urunner.runner import utils +from urunner.runner.logger import Log _LOGGER = Log.get_logger(__file__) diff --git a/static_core/tests/tests-u-runner-2/runner/sts_utils/__init__.py b/static_core/tests/tests-u-runner-2/urunner/runner/reports/__init__.py similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/sts_utils/__init__.py rename to static_core/tests/tests-u-runner-2/urunner/runner/reports/__init__.py diff --git a/static_core/tests/tests-u-runner-2/runner/reports/detailed_report.py b/static_core/tests/tests-u-runner-2/urunner/runner/reports/detailed_report.py similarity index 96% rename from static_core/tests/tests-u-runner-2/runner/reports/detailed_report.py rename to static_core/tests/tests-u-runner-2/urunner/runner/reports/detailed_report.py index 1e5bccb1ddb3f9f4503d3d0be3c081268f57bf3b..40231a138226785da18bbc812d87e4cdc3fc2357 100644 --- a/static_core/tests/tests-u-runner-2/runner/reports/detailed_report.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/reports/detailed_report.py @@ -18,10 +18,10 @@ from datetime import date from os import path from pathlib import Path -from runner.logger import Log -from runner.reports.summary import Summary -from runner.test_base import Test -from runner.utils import write_2_file +from urunner.runner.logger import Log +from urunner.runner.reports.summary import Summary +from urunner.runner.test_base import Test +from urunner.runner.utils import write_2_file _LOGGER = Log.get_logger(__file__) diff --git a/static_core/tests/tests-u-runner-2/runner/reports/detailed_report_template.md b/static_core/tests/tests-u-runner-2/urunner/runner/reports/detailed_report_template.md similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/reports/detailed_report_template.md rename to static_core/tests/tests-u-runner-2/urunner/runner/reports/detailed_report_template.md diff --git a/static_core/tests/tests-u-runner-2/runner/reports/html_view.py b/static_core/tests/tests-u-runner-2/urunner/runner/reports/html_view.py similarity index 93% rename from static_core/tests/tests-u-runner-2/runner/reports/html_view.py rename to static_core/tests/tests-u-runner-2/urunner/runner/reports/html_view.py index 23de2313479b9430e4ee5d8a16a8256deb3efb6e..18cfb29e8dbbf8253e858d2107e62d578960bfac 100644 --- a/static_core/tests/tests-u-runner-2/runner/reports/html_view.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/reports/html_view.py @@ -20,11 +20,11 @@ from pathlib import Path import pytz -from runner.options.config import Config -from runner.reports.report_format import ReportFormat -from runner.reports.summary import Summary -from runner.test_base import Test -from runner.utils import write_2_file +from urunner.runner.options.config import Config +from urunner.runner.reports.report_format import ReportFormat +from urunner.runner.reports.summary import Summary +from urunner.runner.test_base import Test +from urunner.runner.utils import write_2_file INDEX_TITLE = "${Title}" INDEX_OPTIONS = "${Options}" diff --git a/static_core/tests/tests-u-runner-2/runner/reports/index_template.html b/static_core/tests/tests-u-runner-2/urunner/runner/reports/index_template.html similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/reports/index_template.html rename to static_core/tests/tests-u-runner-2/urunner/runner/reports/index_template.html diff --git a/static_core/tests/tests-u-runner-2/runner/reports/report.py b/static_core/tests/tests-u-runner-2/urunner/runner/reports/report.py similarity index 96% rename from static_core/tests/tests-u-runner-2/runner/reports/report.py rename to static_core/tests/tests-u-runner-2/urunner/runner/reports/report.py index e1706cb0fbfc16d6521b565acb90dd8714336ade..720e61840f298ea687883613255bd13495cb94f7 100644 --- a/static_core/tests/tests-u-runner-2/runner/reports/report.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/reports/report.py @@ -20,15 +20,15 @@ from collections.abc import Mapping from os import path from typing import TYPE_CHECKING -from runner.common_exceptions import InvalidConfiguration -from runner.enum_types.params import TestEnv, TestReport -from runner.enum_types.verbose_format import VerboseFilter -from runner.logger import Log -from runner.reports.report_format import ReportFormat -from runner.utils import write_2_file +from urunner.runner.common_exceptions import InvalidConfiguration +from urunner.runner.enum_types.params import TestEnv, TestReport +from urunner.runner.enum_types.verbose_format import VerboseFilter +from urunner.runner.logger import Log +from urunner.runner.reports.report_format import ReportFormat +from urunner.runner.utils import write_2_file if TYPE_CHECKING: - from runner.runner_base import Test + from urunner.runner.runner_base import Test _LOGGER = Log.get_logger(__file__) diff --git a/static_core/tests/tests-u-runner-2/runner/reports/report_format.py b/static_core/tests/tests-u-runner-2/urunner/runner/reports/report_format.py similarity index 92% rename from static_core/tests/tests-u-runner-2/runner/reports/report_format.py rename to static_core/tests/tests-u-runner-2/urunner/runner/reports/report_format.py index 82afdebf80fa476a9c7d636f720d85d854dea9d6..2dccee97a14496852a6cd7089cd18e3054f53e97 100644 --- a/static_core/tests/tests-u-runner-2/runner/reports/report_format.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/reports/report_format.py @@ -15,7 +15,7 @@ # limitations under the License. # -from runner.enum_types.base_enum import BaseEnum +from urunner.runner.enum_types.base_enum import BaseEnum class ReportFormat(BaseEnum): diff --git a/static_core/tests/tests-u-runner-2/runner/reports/report_template.html b/static_core/tests/tests-u-runner-2/urunner/runner/reports/report_template.html similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/reports/report_template.html rename to static_core/tests/tests-u-runner-2/urunner/runner/reports/report_template.html diff --git a/static_core/tests/tests-u-runner-2/runner/reports/report_template.md b/static_core/tests/tests-u-runner-2/urunner/runner/reports/report_template.md similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/reports/report_template.md rename to static_core/tests/tests-u-runner-2/urunner/runner/reports/report_template.md diff --git a/static_core/tests/tests-u-runner-2/runner/reports/standard_view.py b/static_core/tests/tests-u-runner-2/urunner/runner/reports/standard_view.py similarity index 95% rename from static_core/tests/tests-u-runner-2/runner/reports/standard_view.py rename to static_core/tests/tests-u-runner-2/urunner/runner/reports/standard_view.py index f16dff265c10b6654b233889863e0ba704b6b924..7f0e338a27182c8addad7663bd666053a3c7e18b 100644 --- a/static_core/tests/tests-u-runner-2/runner/reports/standard_view.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/reports/standard_view.py @@ -20,12 +20,12 @@ from pathlib import Path import pytz -from runner.logger import Log -from runner.options.options_time_report import TimeReportOptions -from runner.reports.report_format import ReportFormat -from runner.reports.summary import Summary -from runner.test_base import Test -from runner.utils import pretty_divider, write_2_file +from urunner.runner.logger import Log +from urunner.runner.options.options_time_report import TimeReportOptions +from urunner.runner.reports.report_format import ReportFormat +from urunner.runner.reports.summary import Summary +from urunner.runner.test_base import Test +from urunner.runner.utils import pretty_divider, write_2_file _LOGGER = Log.get_logger(__file__) diff --git a/static_core/tests/tests-u-runner-2/runner/reports/summary.py b/static_core/tests/tests-u-runner-2/urunner/runner/reports/summary.py similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/reports/summary.py rename to static_core/tests/tests-u-runner-2/urunner/runner/reports/summary.py diff --git a/static_core/tests/tests-u-runner-2/runner/reports/xml_view.py b/static_core/tests/tests-u-runner-2/urunner/runner/reports/xml_view.py similarity index 94% rename from static_core/tests/tests-u-runner-2/runner/reports/xml_view.py rename to static_core/tests/tests-u-runner-2/urunner/runner/reports/xml_view.py index 99042625fe527ba560edc974e2b50eb65efd5954..175cd573ecd0689caa84c4df9ad0a8c50c2c9ba6 100644 --- a/static_core/tests/tests-u-runner-2/runner/reports/xml_view.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/reports/xml_view.py @@ -18,11 +18,11 @@ import re from pathlib import Path -from runner.logger import Log -from runner.reports.summary import Summary -from runner.suites.test_standard_flow import TestStandardFlow -from runner.test_base import Test -from runner.utils import write_2_file +from urunner.runner.logger import Log +from urunner.runner.reports.summary import Summary +from urunner.runner.suites.test_standard_flow import TestStandardFlow +from urunner.runner.test_base import Test +from urunner.runner.utils import write_2_file _LOGGER = Log.get_logger(__file__) diff --git a/static_core/tests/tests-u-runner-2/runner/runner_base.py b/static_core/tests/tests-u-runner-2/urunner/runner/runner_base.py similarity index 96% rename from static_core/tests/tests-u-runner-2/runner/runner_base.py rename to static_core/tests/tests-u-runner-2/urunner/runner/runner_base.py index 1fc58badc142b5363ab9ce689ff30815997b4faf..7bf8dd0ffd5de0460260f3004be162e04d599071 100644 --- a/static_core/tests/tests-u-runner-2/runner/runner_base.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/runner_base.py @@ -14,7 +14,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # - from abc import ABC, abstractmethod from concurrent.futures import ThreadPoolExecutor from datetime import datetime @@ -23,10 +22,10 @@ from pathlib import Path import pytz from tqdm import tqdm -from runner.logger import Log -from runner.options.config import Config -from runner.test_base import Test -from runner.utils import correct_path +from urunner.runner.logger import Log +from urunner.runner.options.config import Config +from urunner.runner.test_base import Test +from urunner.runner.utils import correct_path _LOGGER = Log.get_logger(__file__) diff --git a/static_core/tests/tests-u-runner-2/runner/runner_file_based.py b/static_core/tests/tests-u-runner-2/urunner/runner/runner_file_based.py similarity index 88% rename from static_core/tests/tests-u-runner-2/runner/runner_file_based.py rename to static_core/tests/tests-u-runner-2/urunner/runner/runner_file_based.py index 999acd80768093ac2ff051f9057ac099da16e9fe..3a850c244d54d66dec7ee9590b9f336bf242abfe 100644 --- a/static_core/tests/tests-u-runner-2/runner/runner_file_based.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/runner_file_based.py @@ -22,22 +22,22 @@ from pathlib import Path import pytz -from runner import common_exceptions -from runner.common_exceptions import UnknownException -from runner.enum_types.params import TestEnv -from runner.enum_types.qemu import QemuKind -from runner.logger import Log -from runner.options.config import Config -from runner.reports.detailed_report import DetailedReport -from runner.reports.html_view import HtmlView -from runner.reports.report_format import ReportFormat -from runner.reports.standard_view import StandardView -from runner.reports.summary import Summary -from runner.reports.xml_view import XmlView -from runner.runner_base import Runner -from runner.suites.test_standard_flow import TestStandardFlow -from runner.suites.work_dir import WorkDir -from runner.test_base import Test +from urunner.runner import common_exceptions +from urunner.runner.common_exceptions import UnknownException +from urunner.runner.enum_types.params import TestEnv +from urunner.runner.enum_types.qemu import QemuKind +from urunner.runner.logger import Log +from urunner.runner.options.config import Config +from urunner.runner.reports.detailed_report import DetailedReport +from urunner.runner.reports.html_view import HtmlView +from urunner.runner.reports.report_format import ReportFormat +from urunner.runner.reports.standard_view import StandardView +from urunner.runner.reports.summary import Summary +from urunner.runner.reports.xml_view import XmlView +from urunner.runner.runner_base import Runner +from urunner.runner.suites.test_standard_flow import TestStandardFlow +from urunner.runner.suites.work_dir import WorkDir +from urunner.runner.test_base import Test INDEX_TITLE = "${Title}" INDEX_OPTIONS = "${Options}" diff --git a/static_core/tests/tests-u-runner-2/runner/test/__init__.py b/static_core/tests/tests-u-runner-2/urunner/runner/sts_utils/__init__.py similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/test/__init__.py rename to static_core/tests/tests-u-runner-2/urunner/runner/sts_utils/__init__.py diff --git a/static_core/tests/tests-u-runner-2/runner/sts_utils/constants.py b/static_core/tests/tests-u-runner-2/urunner/runner/sts_utils/constants.py similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/sts_utils/constants.py rename to static_core/tests/tests-u-runner-2/urunner/runner/sts_utils/constants.py diff --git a/static_core/tests/tests-u-runner-2/runner/sts_utils/exceptions.py b/static_core/tests/tests-u-runner-2/urunner/runner/sts_utils/exceptions.py similarity index 95% rename from static_core/tests/tests-u-runner-2/runner/sts_utils/exceptions.py rename to static_core/tests/tests-u-runner-2/urunner/runner/sts_utils/exceptions.py index a81c06cb593680957c5d93db4bd222829493752d..cf41d3fcd525c79a5e8df4ce0d082f8ce2c26ff1 100644 --- a/static_core/tests/tests-u-runner-2/runner/sts_utils/exceptions.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/sts_utils/exceptions.py @@ -15,7 +15,7 @@ # limitations under the License. # -from runner.common_exceptions import RunnerException +from urunner.runner.common_exceptions import RunnerException class InvalidFileFormatException(RunnerException): diff --git a/static_core/tests/tests-u-runner-2/runner/sts_utils/file_structure.py b/static_core/tests/tests-u-runner-2/urunner/runner/sts_utils/file_structure.py similarity index 99% rename from static_core/tests/tests-u-runner-2/runner/sts_utils/file_structure.py rename to static_core/tests/tests-u-runner-2/urunner/runner/sts_utils/file_structure.py index fdf5bb08446f7db95d43c1e546cc76606d7a4a86..0c534446bf8c30c5fd7b9355b69b16c706216622 100644 --- a/static_core/tests/tests-u-runner-2/runner/sts_utils/file_structure.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/sts_utils/file_structure.py @@ -23,7 +23,7 @@ from collections.abc import Iterator from dataclasses import dataclass from pathlib import Path -from runner.logger import Log +from urunner.runner.logger import Log __LOGGER = Log.get_logger(__file__) diff --git a/static_core/tests/tests-u-runner-2/runner/sts_utils/metainformation.py b/static_core/tests/tests-u-runner-2/urunner/runner/sts_utils/metainformation.py similarity index 94% rename from static_core/tests/tests-u-runner-2/runner/sts_utils/metainformation.py rename to static_core/tests/tests-u-runner-2/urunner/runner/sts_utils/metainformation.py index 06bda99c78fa21f89651f726ae69b082e7376154..e81f937ec8725a30a1abe8f424300eac4596b719 100644 --- a/static_core/tests/tests-u-runner-2/runner/sts_utils/metainformation.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/sts_utils/metainformation.py @@ -22,8 +22,8 @@ import re import yaml -from runner.common_exceptions import RunnerException -from runner.sts_utils.constants import META_END_PATTERN, META_END_STRING, META_START_PATTERN, META_START_STRING +from urunner.runner.common_exceptions import RunnerException +from urunner.runner.sts_utils.constants import META_END_PATTERN, META_END_STRING, META_START_PATTERN, META_START_STRING ParsedMeta = dict MetaInText = tuple[int, int, ParsedMeta] diff --git a/static_core/tests/tests-u-runner-2/runner/sts_utils/test_case.py b/static_core/tests/tests-u-runner-2/urunner/runner/sts_utils/test_case.py similarity index 92% rename from static_core/tests/tests-u-runner-2/runner/sts_utils/test_case.py rename to static_core/tests/tests-u-runner-2/urunner/runner/sts_utils/test_case.py index 4f9491756bb0d47a4ac09b92c04cd1e4f03b4470..75416112acc5c73a8dda2f4402f38b5eb5d7ae4e 100644 --- a/static_core/tests/tests-u-runner-2/runner/sts_utils/test_case.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/sts_utils/test_case.py @@ -17,7 +17,7 @@ from pathlib import Path -from runner.sts_utils.constants import NEGATIVE_EXECUTION_PREFIX, NEGATIVE_PREFIX, SKIP_PREFIX +from urunner.runner.sts_utils.constants import NEGATIVE_EXECUTION_PREFIX, NEGATIVE_PREFIX, SKIP_PREFIX def is_negative(path: Path) -> bool: diff --git a/static_core/tests/tests-u-runner-2/runner/sts_utils/test_parameters.py b/static_core/tests/tests-u-runner-2/urunner/runner/sts_utils/test_parameters.py similarity index 90% rename from static_core/tests/tests-u-runner-2/runner/sts_utils/test_parameters.py rename to static_core/tests/tests-u-runner-2/urunner/runner/sts_utils/test_parameters.py index 925d11a4feaf321f2211dff7872ba3eb100c8f7e..79de90342e318efad3fb740f455cf5d63186c064 100644 --- a/static_core/tests/tests-u-runner-2/runner/sts_utils/test_parameters.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/sts_utils/test_parameters.py @@ -24,9 +24,9 @@ from typing import Any import yaml -from runner.sts_utils.constants import LIST_PREFIX, YAML_EXTENSIONS -from runner.sts_utils.exceptions import InvalidFileFormatException -from runner.utils import iter_files, read_file +from urunner.runner.sts_utils.constants import LIST_PREFIX, YAML_EXTENSIONS +from urunner.runner.sts_utils.exceptions import InvalidFileFormatException +from urunner.runner.utils import iter_files, read_file Params = dict diff --git a/static_core/tests/tests-u-runner-2/runner/suites/__init__.py b/static_core/tests/tests-u-runner-2/urunner/runner/suites/__init__.py similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/suites/__init__.py rename to static_core/tests/tests-u-runner-2/urunner/runner/suites/__init__.py diff --git a/static_core/tests/tests-u-runner-2/runner/suites/ets-verifier.config b/static_core/tests/tests-u-runner-2/urunner/runner/suites/ets-verifier.config similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/suites/ets-verifier.config rename to static_core/tests/tests-u-runner-2/urunner/runner/suites/ets-verifier.config diff --git a/static_core/tests/tests-u-runner-2/runner/suites/one_test_runner.py b/static_core/tests/tests-u-runner-2/urunner/runner/suites/one_test_runner.py similarity index 98% rename from static_core/tests/tests-u-runner-2/runner/suites/one_test_runner.py rename to static_core/tests/tests-u-runner-2/urunner/runner/suites/one_test_runner.py index bca6f4314ee9c696a58f67f40aa4ea9108ae4490..41a68f142381a17de1478279b91f4780715b6852 100644 --- a/static_core/tests/tests-u-runner-2/runner/suites/one_test_runner.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/suites/one_test_runner.py @@ -20,8 +20,8 @@ from collections.abc import Callable from copy import deepcopy from pathlib import Path -from runner.enum_types.params import BinaryParams, TestEnv, TestReport -from runner.logger import Log +from urunner.runner.enum_types.params import BinaryParams, TestEnv, TestReport +from urunner.runner.logger import Log _LOGGER = Log.get_logger(__file__) diff --git a/static_core/tests/tests-u-runner-2/runner/suites/preparation_step.py b/static_core/tests/tests-u-runner-2/urunner/runner/suites/preparation_step.py similarity index 94% rename from static_core/tests/tests-u-runner-2/runner/suites/preparation_step.py rename to static_core/tests/tests-u-runner-2/urunner/runner/suites/preparation_step.py index 0c6b14c1533f89e5e0eadc0df69a82ae2962038f..acf8cb5ccbd08c8719fef2e897e039b1aeba9cfb 100644 --- a/static_core/tests/tests-u-runner-2/runner/suites/preparation_step.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/suites/preparation_step.py @@ -24,13 +24,13 @@ from concurrent.futures import ThreadPoolExecutor from glob import glob from pathlib import Path -from runner.common_exceptions import InvalidConfiguration, TimeoutException, UnknownException -from runner.extensions.generators.igenerator import IGenerator -from runner.logger import Log -from runner.options.config import Config -from runner.options.options_collections import CollectionsOptions -from runner.suites.test_metadata import TestMetadata -from runner.utils import UiUpdater, copy, get_class_by_name, read_file, write_2_file +from urunner.runner.common_exceptions import InvalidConfiguration, TimeoutException, UnknownException +from urunner.runner.extensions.generators.igenerator import IGenerator +from urunner.runner.logger import Log +from urunner.runner.options.config import Config +from urunner.runner.options.options_collections import CollectionsOptions +from urunner.runner.suites.test_metadata import TestMetadata +from urunner.runner.utils import UiUpdater, copy, get_class_by_name, read_file, write_2_file _LOGGER = Log.get_logger(__file__) diff --git a/static_core/tests/tests-u-runner-2/runner/suites/runner_standard_flow.py b/static_core/tests/tests-u-runner-2/urunner/runner/suites/runner_standard_flow.py similarity index 91% rename from static_core/tests/tests-u-runner-2/runner/suites/runner_standard_flow.py rename to static_core/tests/tests-u-runner-2/urunner/runner/suites/runner_standard_flow.py index 9ed1d37ba6d45e7134204cb5d923d14f3a0ebd75..8f285ecff787aee8c1c1419f46c83cb0b5e57ac6 100644 --- a/static_core/tests/tests-u-runner-2/runner/suites/runner_standard_flow.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/suites/runner_standard_flow.py @@ -20,17 +20,17 @@ from pathlib import Path import pytz -from runner import utils -from runner.code_coverage.coverage_manager import CoverageManager -from runner.common_exceptions import InvalidConfiguration -from runner.cpumask import CPUMask -from runner.enum_types.params import TestEnv -from runner.logger import Log -from runner.options.config import Config -from runner.options.step import StepKind -from runner.runner_file_based import RunnerFileBased -from runner.suites.test_suite import TestSuite -from runner.suites.work_dir import WorkDir +from urunner.runner import utils +from urunner.runner.code_coverage.coverage_manager import CoverageManager +from urunner.runner.common_exceptions import InvalidConfiguration +from urunner.runner.cpumask import CPUMask +from urunner.runner.enum_types.params import TestEnv +from urunner.runner.logger import Log +from urunner.runner.options.config import Config +from urunner.runner.options.step import StepKind +from urunner.runner.runner_file_based import RunnerFileBased +from urunner.runner.suites.test_suite import TestSuite +from urunner.runner.suites.work_dir import WorkDir _LOGGER = Log.get_logger(__file__) diff --git a/static_core/tests/tests-u-runner-2/runner/suites/step_utils.py b/static_core/tests/tests-u-runner-2/urunner/runner/suites/step_utils.py similarity index 97% rename from static_core/tests/tests-u-runner-2/runner/suites/step_utils.py rename to static_core/tests/tests-u-runner-2/urunner/runner/suites/step_utils.py index 011491ac3fc64f69480f84b5e426696b024a5de3..4e1f74eb37a71c66f878c54b570f9f9b4e44776e 100644 --- a/static_core/tests/tests-u-runner-2/runner/suites/step_utils.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/suites/step_utils.py @@ -18,7 +18,7 @@ from pathlib import Path import yaml -from runner.logger import Log +from urunner.runner.logger import Log _LOGGER = Log.get_logger(__file__) diff --git a/static_core/tests/tests-u-runner-2/runner/suites/test_lists.py b/static_core/tests/tests-u-runner-2/urunner/runner/suites/test_lists.py similarity index 95% rename from static_core/tests/tests-u-runner-2/runner/suites/test_lists.py rename to static_core/tests/tests-u-runner-2/urunner/runner/suites/test_lists.py index 300f1e835fea5fb5615e33c4d829f00646177b54..983f32d3a61e980cc767534f422b54c66b9e24f5 100644 --- a/static_core/tests/tests-u-runner-2/runner/suites/test_lists.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/suites/test_lists.py @@ -21,17 +21,17 @@ from os import path from pathlib import Path from typing import cast -from runner import utils -from runner.common_exceptions import InvalidConfiguration -from runner.enum_types.configuration_kind import ( +from urunner.runner import utils +from urunner.runner.common_exceptions import InvalidConfiguration +from urunner.runner.enum_types.configuration_kind import ( BuildTypeKind, ConfigurationKind, SanitizerKind, ) -from runner.enum_types.params import TestEnv -from runner.logger import Log -from runner.options.step import Step, StepKind -from runner.utils import correct_path, detect_architecture, detect_operating_system +from urunner.runner.enum_types.params import TestEnv +from urunner.runner.logger import Log +from urunner.runner.options.step import Step, StepKind +from urunner.runner.utils import correct_path, detect_architecture, detect_operating_system _LOGGER = Log.get_logger(__file__) diff --git a/static_core/tests/tests-u-runner-2/runner/suites/test_metadata.py b/static_core/tests/tests-u-runner-2/urunner/runner/suites/test_metadata.py similarity index 97% rename from static_core/tests/tests-u-runner-2/runner/suites/test_metadata.py rename to static_core/tests/tests-u-runner-2/urunner/runner/suites/test_metadata.py index 619d6fdf56315521129e7bf9215be198b817ad34..3528eb1f09a6ef3383878d79a63319e438279b8c 100644 --- a/static_core/tests/tests-u-runner-2/runner/suites/test_metadata.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/suites/test_metadata.py @@ -22,9 +22,9 @@ from typing import Any import yaml -from runner.common_exceptions import InvalidConfiguration -from runner.enum_types.base_enum import BaseEnum -from runner.logger import Log +from urunner.runner.common_exceptions import InvalidConfiguration +from urunner.runner.enum_types.base_enum import BaseEnum +from urunner.runner.logger import Log METADATA_PATTERN = re.compile(r"(?<=/\*---)(.*?)(?=---\*/)", flags=re.DOTALL) DOTS_WHITESPACES_PATTERN = r"(\.\w+)*" diff --git a/static_core/tests/tests-u-runner-2/runner/suites/test_standard_flow.py b/static_core/tests/tests-u-runner-2/urunner/runner/suites/test_standard_flow.py similarity index 95% rename from static_core/tests/tests-u-runner-2/runner/suites/test_standard_flow.py rename to static_core/tests/tests-u-runner-2/urunner/runner/suites/test_standard_flow.py index e053b7d60c98874d002a9cc5a133fa169205705b..3ce883c808de44b57a794037461063030a331205 100644 --- a/static_core/tests/tests-u-runner-2/runner/suites/test_standard_flow.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/suites/test_standard_flow.py @@ -21,19 +21,19 @@ from collections.abc import Sequence from copy import deepcopy from pathlib import Path -from runner import utils -from runner.common_exceptions import InvalidConfiguration -from runner.enum_types.params import BinaryParams, TestEnv, TestReport -from runner.extensions.validators.base_validator import BaseValidator -from runner.extensions.validators.ivalidator import IValidator -from runner.logger import Log -from runner.options.macros import Macros, ParameterNotFound -from runner.options.options import IOptions -from runner.options.step import Step, StepKind -from runner.suites.one_test_runner import OneTestRunner -from runner.suites.test_metadata import TestMetadata -from runner.test_base import Test -from runner.utils import get_class_by_name, to_bool +from urunner.runner import utils +from urunner.runner.common_exceptions import InvalidConfiguration +from urunner.runner.enum_types.params import BinaryParams, TestEnv, TestReport +from urunner.runner.extensions.validators.base_validator import BaseValidator +from urunner.runner.extensions.validators.ivalidator import IValidator +from urunner.runner.logger import Log +from urunner.runner.options.macros import Macros, ParameterNotFound +from urunner.runner.options.options import IOptions +from urunner.runner.options.step import Step, StepKind +from urunner.runner.suites.one_test_runner import OneTestRunner +from urunner.runner.suites.test_metadata import TestMetadata +from urunner.runner.test_base import Test +from urunner.runner.utils import get_class_by_name, to_bool _LOGGER = Log.get_logger(__file__) diff --git a/static_core/tests/tests-u-runner-2/runner/suites/test_suite.py b/static_core/tests/tests-u-runner-2/urunner/runner/suites/test_suite.py similarity index 96% rename from static_core/tests/tests-u-runner-2/runner/suites/test_suite.py rename to static_core/tests/tests-u-runner-2/urunner/runner/suites/test_suite.py index 416735264d338e7a8c28ec8b6e7215bcf2293ca0..cc2d134e2375e46d774ec472b4b500aec25210fa 100644 --- a/static_core/tests/tests-u-runner-2/runner/suites/test_suite.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/suites/test_suite.py @@ -25,17 +25,17 @@ from os import path from pathlib import Path from typing import ClassVar -from runner.chapters import Chapters -from runner.common_exceptions import FileNotFoundException, InvalidConfiguration, TestNotExistException -from runner.enum_types.params import TestEnv -from runner.logger import Log -from runner.options.options import IOptions -from runner.options.options_collections import CollectionsOptions -from runner.suites.preparation_step import CopyStep, CustomGeneratorTestPreparationStep, TestPreparationStep -from runner.suites.step_utils import StepUtils -from runner.suites.test_lists import TestLists -from runner.suites.test_standard_flow import TestStandardFlow -from runner.utils import correct_path, get_group_number, get_test_id +from urunner.runner.chapters import Chapters +from urunner.runner.common_exceptions import FileNotFoundException, InvalidConfiguration, TestNotExistException +from urunner.runner.enum_types.params import TestEnv +from urunner.runner.logger import Log +from urunner.runner.options.options import IOptions +from urunner.runner.options.options_collections import CollectionsOptions +from urunner.runner.suites.preparation_step import CopyStep, CustomGeneratorTestPreparationStep, TestPreparationStep +from urunner.runner.suites.step_utils import StepUtils +from urunner.runner.suites.test_lists import TestLists +from urunner.runner.suites.test_standard_flow import TestStandardFlow +from urunner.runner.utils import correct_path, get_group_number, get_test_id _LOGGER = Log.get_logger(__file__) diff --git a/static_core/tests/tests-u-runner-2/runner/suites/work_dir.py b/static_core/tests/tests-u-runner-2/urunner/runner/suites/work_dir.py similarity index 93% rename from static_core/tests/tests-u-runner-2/runner/suites/work_dir.py rename to static_core/tests/tests-u-runner-2/urunner/runner/suites/work_dir.py index ec32a702077f0ec3c72874907f2cecb73b71d538..6b703e149967ac81ff67f8ceba009c40d3799b8c 100644 --- a/static_core/tests/tests-u-runner-2/runner/suites/work_dir.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/suites/work_dir.py @@ -18,8 +18,8 @@ import shutil from functools import cached_property from pathlib import Path -from runner.code_coverage.coverage_dir import CoverageDir -from runner.options.config import Config +from urunner.runner.code_coverage.coverage_dir import CoverageDir +from urunner.runner.options.config import Config class WorkDir: diff --git a/static_core/tests/tests-u-runner-2/runner/test_base.py b/static_core/tests/tests-u-runner-2/urunner/runner/test_base.py similarity index 93% rename from static_core/tests/tests-u-runner-2/runner/test_base.py rename to static_core/tests/tests-u-runner-2/urunner/runner/test_base.py index 7c26cd9e6e47dfab01e53c7f9350a1c02a149a83..2dc4bfa2a820e001f92eb521d90417545003b446 100644 --- a/static_core/tests/tests-u-runner-2/runner/test_base.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/test_base.py @@ -22,14 +22,14 @@ from pathlib import Path import pytz -from runner.enum_types.base_enum import BaseEnum -from runner.enum_types.params import TestEnv, TestReport -from runner.enum_types.verbose_format import VerboseFilter, VerboseKind -from runner.logger import Log -from runner.options.local_env import LocalEnv -from runner.options.options import IOptions -from runner.reports.report import ReportGenerator -from runner.reports.report_format import ReportFormat +from urunner.runner.enum_types.base_enum import BaseEnum +from urunner.runner.enum_types.params import TestEnv, TestReport +from urunner.runner.enum_types.verbose_format import VerboseFilter, VerboseKind +from urunner.runner.logger import Log +from urunner.runner.options.local_env import LocalEnv +from urunner.runner.options.options import IOptions +from urunner.runner.reports.report import ReportGenerator +from urunner.runner.reports.report_format import ReportFormat _LOGGER = Log.get_logger(__file__) diff --git a/static_core/tests/tests-u-runner-2/runner/utils.py b/static_core/tests/tests-u-runner-2/urunner/runner/utils.py similarity index 98% rename from static_core/tests/tests-u-runner-2/runner/utils.py rename to static_core/tests/tests-u-runner-2/urunner/runner/utils.py index 4bfa298bd1a22875e93187393819b0d8d8061443..d45a196301f032168f82d439fc5168ef94f6d9b7 100644 --- a/static_core/tests/tests-u-runner-2/runner/utils.py +++ b/static_core/tests/tests-u-runner-2/urunner/runner/utils.py @@ -38,16 +38,16 @@ from urllib.error import URLError import yaml -from runner.common_exceptions import ( +from urunner.runner.common_exceptions import ( DownloadException, FileNotFoundException, InvalidConfiguration, UnzipException, YamlException, ) -from runner.enum_types.base_enum import EnumT -from runner.enum_types.configuration_kind import ArchitectureKind, OSKind -from runner.logger import Log +from urunner.runner.enum_types.base_enum import EnumT +from urunner.runner.enum_types.configuration_kind import ArchitectureKind, OSKind +from urunner.runner.logger import Log _LOGGER = Log.get_logger(__file__) diff --git a/static_core/tests/tests-u-runner-2/runner/test/chapters_test/__init__.py b/static_core/tests/tests-u-runner-2/urunner/test/__init__.py similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/test/chapters_test/__init__.py rename to static_core/tests/tests-u-runner-2/urunner/test/__init__.py diff --git a/static_core/tests/tests-u-runner-2/runner/test/config_test/__init__.py b/static_core/tests/tests-u-runner-2/urunner/test/chapters_test/__init__.py similarity index 99% rename from static_core/tests/tests-u-runner-2/runner/test/config_test/__init__.py rename to static_core/tests/tests-u-runner-2/urunner/test/chapters_test/__init__.py index 4f521bb54ba825da00c339e4cde4e9365c5060fa..a38fde8d57d34880d902ef3b8e0963c2fa095061 100644 --- a/static_core/tests/tests-u-runner-2/runner/test/config_test/__init__.py +++ b/static_core/tests/tests-u-runner-2/urunner/test/chapters_test/__init__.py @@ -8,6 +8,7 @@ # # http://www.apache.org/licenses/LICENSE-2.0 # +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/static_core/tests/tests-u-runner-2/runner/test/chapters_test/chapters_neg_1_test.yaml b/static_core/tests/tests-u-runner-2/urunner/test/chapters_test/chapters_neg_1_test.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/test/chapters_test/chapters_neg_1_test.yaml rename to static_core/tests/tests-u-runner-2/urunner/test/chapters_test/chapters_neg_1_test.yaml diff --git a/static_core/tests/tests-u-runner-2/runner/test/chapters_test/chapters_neg_2_test.yaml b/static_core/tests/tests-u-runner-2/urunner/test/chapters_test/chapters_neg_2_test.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/test/chapters_test/chapters_neg_2_test.yaml rename to static_core/tests/tests-u-runner-2/urunner/test/chapters_test/chapters_neg_2_test.yaml diff --git a/static_core/tests/tests-u-runner-2/runner/test/chapters_test/chapters_neg_3_test.yaml b/static_core/tests/tests-u-runner-2/urunner/test/chapters_test/chapters_neg_3_test.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/test/chapters_test/chapters_neg_3_test.yaml rename to static_core/tests/tests-u-runner-2/urunner/test/chapters_test/chapters_neg_3_test.yaml diff --git a/static_core/tests/tests-u-runner-2/runner/test/chapters_test/chapters_neg_4_test.yaml b/static_core/tests/tests-u-runner-2/urunner/test/chapters_test/chapters_neg_4_test.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/test/chapters_test/chapters_neg_4_test.yaml rename to static_core/tests/tests-u-runner-2/urunner/test/chapters_test/chapters_neg_4_test.yaml diff --git a/static_core/tests/tests-u-runner-2/runner/test/chapters_test/chapters_neg_test.py b/static_core/tests/tests-u-runner-2/urunner/test/chapters_test/chapters_neg_test.py similarity index 96% rename from static_core/tests/tests-u-runner-2/runner/test/chapters_test/chapters_neg_test.py rename to static_core/tests/tests-u-runner-2/urunner/test/chapters_test/chapters_neg_test.py index 8652088c5bb3886d2196735d33430c67e52e7583..f588863a266fe737476805c5bdb3294b3013437c 100644 --- a/static_core/tests/tests-u-runner-2/runner/test/chapters_test/chapters_neg_test.py +++ b/static_core/tests/tests-u-runner-2/urunner/test/chapters_test/chapters_neg_test.py @@ -17,7 +17,7 @@ import unittest from pathlib import Path -from runner.chapters import Chapters, IncorrectFileFormatChapterException +from urunner.runner.chapters import Chapters, IncorrectFileFormatChapterException class ChapterNegativeCases(unittest.TestCase): diff --git a/static_core/tests/tests-u-runner-2/runner/test/chapters_test/chapters_test.py b/static_core/tests/tests-u-runner-2/urunner/test/chapters_test/chapters_test.py similarity index 99% rename from static_core/tests/tests-u-runner-2/runner/test/chapters_test/chapters_test.py rename to static_core/tests/tests-u-runner-2/urunner/test/chapters_test/chapters_test.py index 2fb3ce290d4f5a053ec4fb2c2383adeb86462593..e8adc3998caeec28c7f3b03264ea92f28ab390ec 100644 --- a/static_core/tests/tests-u-runner-2/runner/test/chapters_test/chapters_test.py +++ b/static_core/tests/tests-u-runner-2/urunner/test/chapters_test/chapters_test.py @@ -17,7 +17,7 @@ import unittest from pathlib import Path -from runner.chapters import Chapters +from urunner.runner.chapters import Chapters class ChapterTest(unittest.TestCase): diff --git a/static_core/tests/tests-u-runner-2/runner/test/chapters_test/chapters_test.yaml b/static_core/tests/tests-u-runner-2/urunner/test/chapters_test/chapters_test.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/test/chapters_test/chapters_test.yaml rename to static_core/tests/tests-u-runner-2/urunner/test/chapters_test/chapters_test.yaml diff --git a/static_core/tests/tests-u-runner-2/urunner/test/config_test/__init__.py b/static_core/tests/tests-u-runner-2/urunner/test/config_test/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..a38fde8d57d34880d902ef3b8e0963c2fa095061 --- /dev/null +++ b/static_core/tests/tests-u-runner-2/urunner/test/config_test/__init__.py @@ -0,0 +1,16 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# +# Copyright (c) 2024-2025 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. diff --git a/static_core/tests/tests-u-runner-2/runner/test/config_test/cli_options_test1.py b/static_core/tests/tests-u-runner-2/urunner/test/config_test/cli_options_test1.py similarity index 97% rename from static_core/tests/tests-u-runner-2/runner/test/config_test/cli_options_test1.py rename to static_core/tests/tests-u-runner-2/urunner/test/config_test/cli_options_test1.py index 4d895049ba10437f745e6bdcc8bedc2ea90c8ae0..d8f14d1c147c3c01df84589d7f27db4fecd53f60 100644 --- a/static_core/tests/tests-u-runner-2/runner/test/config_test/cli_options_test1.py +++ b/static_core/tests/tests-u-runner-2/urunner/test/config_test/cli_options_test1.py @@ -17,9 +17,9 @@ import unittest from pathlib import Path -from runner.options.cli_options import CliOptions -from runner.test.test_utils import MethodType -from runner.test.test_utils import get_method as gm +from urunner.runner.options.cli_options import CliOptions +from urunner.test.test_utils import MethodType +from urunner.test.test_utils import get_method as gm class CliOptionsTest1(unittest.TestCase): diff --git a/static_core/tests/tests-u-runner-2/runner/test/config_test/cli_options_test2.py b/static_core/tests/tests-u-runner-2/urunner/test/config_test/cli_options_test2.py similarity index 97% rename from static_core/tests/tests-u-runner-2/runner/test/config_test/cli_options_test2.py rename to static_core/tests/tests-u-runner-2/urunner/test/config_test/cli_options_test2.py index 5f2e6776879d2c694df32ea733b1ba209c480faa..3e99e6511c023eaf8e5e4b08fd7c1415b7da687a 100644 --- a/static_core/tests/tests-u-runner-2/runner/test/config_test/cli_options_test2.py +++ b/static_core/tests/tests-u-runner-2/urunner/test/config_test/cli_options_test2.py @@ -16,10 +16,10 @@ import unittest -from runner.common_exceptions import InvalidConfiguration -from runner.options.cli_options import CliOptions -from runner.test.test_utils import MethodType -from runner.test.test_utils import get_method as gm +from urunner.runner.common_exceptions import InvalidConfiguration +from urunner.runner.options.cli_options import CliOptions +from urunner.test.test_utils import MethodType +from urunner.test.test_utils import get_method as gm class CliOptionsTest2(unittest.TestCase): diff --git a/static_core/tests/tests-u-runner-2/runner/test/config_test/config-1.yaml b/static_core/tests/tests-u-runner-2/urunner/test/config_test/config-1.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/test/config_test/config-1.yaml rename to static_core/tests/tests-u-runner-2/urunner/test/config_test/config-1.yaml diff --git a/static_core/tests/tests-u-runner-2/runner/test/config_test/config-hybrid.yaml b/static_core/tests/tests-u-runner-2/urunner/test/config_test/config-hybrid.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/test/config_test/config-hybrid.yaml rename to static_core/tests/tests-u-runner-2/urunner/test/config_test/config-hybrid.yaml diff --git a/static_core/tests/tests-u-runner-2/runner/test/config_test/data_1.py b/static_core/tests/tests-u-runner-2/urunner/test/config_test/data_1.py similarity index 89% rename from static_core/tests/tests-u-runner-2/runner/test/config_test/data_1.py rename to static_core/tests/tests-u-runner-2/urunner/test/config_test/data_1.py index 882a2f574e9b1113fd668cbe82e3453d11c6a15c..23df2db2636c658093789f7f5d10876e30e96d9a 100644 --- a/static_core/tests/tests-u-runner-2/runner/test/config_test/data_1.py +++ b/static_core/tests/tests-u-runner-2/urunner/test/config_test/data_1.py @@ -16,13 +16,14 @@ from pathlib import Path -from runner.enum_types.configuration_kind import ArchitectureKind, BuildTypeKind, OSKind, SanitizerKind -from runner.enum_types.qemu import QemuKind -from runner.enum_types.verbose_format import VerboseFilter, VerboseKind +from urunner.runner.enum_types.configuration_kind import ArchitectureKind, BuildTypeKind, OSKind, SanitizerKind +from urunner.runner.enum_types.qemu import QemuKind +from urunner.runner.enum_types.verbose_format import VerboseFilter, VerboseKind args = { 'workflow': 'config-1', - 'config-1.path': Path(__file__).parent.parent.parent.parent.joinpath('cfg/workflows/config-1.yaml').resolve(), + 'config-1.path': + Path(__file__).parent.parent.parent.parent.joinpath('urunner/cfg/workflows/config-1.yaml').resolve(), 'config-1.data': { 'runner-api-level': '0.0.0.1', 'type': 'workflow', @@ -51,9 +52,9 @@ args = { 'config-1.parameters.int-param': 20, 'config-1.parameters.bool-param': True, 'config-1.parameters.list-param': ['--gen-stdlib=false', '--thread=0'], - 'test-suite': 'test_suite1', 'test_suite1.path': (Path(__file__).parent.parent.parent.parent - .joinpath('cfg/test-suites/test_suite1.yaml').resolve()), + .joinpath('urunner/cfg/test-suites/test_suite1.yaml').resolve()), + 'test-suite': 'test_suite1', 'test_suite1.data': { 'version': '0.0.0.1', 'type': 'test-suite', diff --git a/static_core/tests/tests-u-runner-2/runner/test/config_test/data_2.py b/static_core/tests/tests-u-runner-2/urunner/test/config_test/data_2.py similarity index 89% rename from static_core/tests/tests-u-runner-2/runner/test/config_test/data_2.py rename to static_core/tests/tests-u-runner-2/urunner/test/config_test/data_2.py index 294e21cb1d012568ddefa7906a1ccfcb60cc37cd..6c313c28567d0afad7c9e555c6f4037815aa8997 100644 --- a/static_core/tests/tests-u-runner-2/runner/test/config_test/data_2.py +++ b/static_core/tests/tests-u-runner-2/urunner/test/config_test/data_2.py @@ -16,13 +16,14 @@ from pathlib import Path -from runner.enum_types.configuration_kind import ArchitectureKind, BuildTypeKind, OSKind, SanitizerKind -from runner.enum_types.qemu import QemuKind -from runner.enum_types.verbose_format import VerboseFilter, VerboseKind +from urunner.runner.enum_types.configuration_kind import ArchitectureKind, BuildTypeKind, OSKind, SanitizerKind +from urunner.runner.enum_types.qemu import QemuKind +from urunner.runner.enum_types.verbose_format import VerboseFilter, VerboseKind args = { 'workflow': 'config-1', - 'config-1.path': Path(__file__).parent.parent.parent.parent.joinpath('cfg/workflows/config-1.yaml').resolve(), + 'config-1.path': + Path(__file__).parent.parent.parent.parent.joinpath('urunner/cfg/workflows/config-1.yaml').resolve(), 'config-1.data': { 'runner-api-level': '0.0.0.1', 'type': 'workflow', @@ -51,9 +52,9 @@ args = { 'config-1.parameters.int-param': 20, 'config-1.parameters.bool-param': True, 'config-1.parameters.list-param': ['--gen-stdlib=false', '--thread=0'], - 'test-suite': 'test_suite1', 'test_suite1.path': (Path(__file__).parent.parent.parent.parent - .joinpath('cfg/test-suites/test_suite1.yaml').resolve()), + .joinpath('urunner/cfg/test-suites/test_suite1.yaml').resolve()), + 'test-suite': 'test_suite1', 'test_suite1.data': { 'version': '0.0.0.1', 'type': 'test-suite', diff --git a/static_core/tests/tests-u-runner-2/runner/test/config_test/data_3.py b/static_core/tests/tests-u-runner-2/urunner/test/config_test/data_3.py similarity index 91% rename from static_core/tests/tests-u-runner-2/runner/test/config_test/data_3.py rename to static_core/tests/tests-u-runner-2/urunner/test/config_test/data_3.py index 4ad226d1eefc9618b5a698fe38590e48bfd4049a..c57269097f45a69f9a8b82073a1047da56dc0a6c 100644 --- a/static_core/tests/tests-u-runner-2/runner/test/config_test/data_3.py +++ b/static_core/tests/tests-u-runner-2/urunner/test/config_test/data_3.py @@ -16,14 +16,14 @@ from pathlib import Path -from runner.enum_types.configuration_kind import ArchitectureKind, BuildTypeKind, OSKind, SanitizerKind -from runner.enum_types.qemu import QemuKind -from runner.enum_types.verbose_format import VerboseFilter, VerboseKind +from urunner.runner.enum_types.configuration_kind import ArchitectureKind, BuildTypeKind, OSKind, SanitizerKind +from urunner.runner.enum_types.qemu import QemuKind +from urunner.runner.enum_types.verbose_format import VerboseFilter, VerboseKind args = { 'workflow': 'config-hybrid', 'config-hybrid.path': Path(__file__).parent.parent.parent.parent - .joinpath('cfg/workflows/config-hybrid.yaml').resolve(), + .joinpath('urunner/cfg/workflows/config-hybrid.yaml').resolve(), 'config-hybrid.data': { 'runner-api-level': '0.0.0.1', 'type': 'workflow', @@ -45,7 +45,7 @@ args = { 'timeout': '30' }, 'ark_js_napi_cli': { - 'executable-path': './runner/extensions/generators/ets_arkjs_xgc/ark_js_napi_cli_runner.sh', + 'executable-path': 'urunner/runner/extensions/generators/ets_arkjs_xgc/ark_js_napi_cli_runner.sh', 'args': [ '--work-dir ${parameters.work-dir}/intermediate', '--build-dir .', diff --git a/static_core/tests/tests-u-runner-2/runner/test/config_test/data_collections.py b/static_core/tests/tests-u-runner-2/urunner/test/config_test/data_collections.py similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/test/config_test/data_collections.py rename to static_core/tests/tests-u-runner-2/urunner/test/config_test/data_collections.py diff --git a/static_core/tests/tests-u-runner-2/runner/test/config_test/data_test_suite0.py b/static_core/tests/tests-u-runner-2/urunner/test/config_test/data_test_suite0.py similarity index 94% rename from static_core/tests/tests-u-runner-2/runner/test/config_test/data_test_suite0.py rename to static_core/tests/tests-u-runner-2/urunner/test/config_test/data_test_suite0.py index 57d1578fd6546ca2b3ee37ed113842c3664350ad..472d64d6b2cf9610c8349b006597e3a91173e96f 100644 --- a/static_core/tests/tests-u-runner-2/runner/test/config_test/data_test_suite0.py +++ b/static_core/tests/tests-u-runner-2/urunner/test/config_test/data_test_suite0.py @@ -16,9 +16,9 @@ from pathlib import Path -from runner.enum_types.configuration_kind import ArchitectureKind, BuildTypeKind, OSKind, SanitizerKind -from runner.enum_types.qemu import QemuKind -from runner.enum_types.verbose_format import VerboseFilter, VerboseKind +from urunner.runner.enum_types.configuration_kind import ArchitectureKind, BuildTypeKind, OSKind, SanitizerKind +from urunner.runner.enum_types.qemu import QemuKind +from urunner.runner.enum_types.verbose_format import VerboseFilter, VerboseKind args = { 'workflow': 'config-1', diff --git a/static_core/tests/tests-u-runner-2/runner/test/config_test/test_suite1.yaml b/static_core/tests/tests-u-runner-2/urunner/test/config_test/test_suite1.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/test/config_test/test_suite1.yaml rename to static_core/tests/tests-u-runner-2/urunner/test/config_test/test_suite1.yaml diff --git a/static_core/tests/tests-u-runner-2/runner/test/config_test/test_suite2.yaml b/static_core/tests/tests-u-runner-2/urunner/test/config_test/test_suite2.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/test/config_test/test_suite2.yaml rename to static_core/tests/tests-u-runner-2/urunner/test/config_test/test_suite2.yaml diff --git a/static_core/tests/tests-u-runner-2/runner/test/config_test/test_suite3.yaml b/static_core/tests/tests-u-runner-2/urunner/test/config_test/test_suite3.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/test/config_test/test_suite3.yaml rename to static_core/tests/tests-u-runner-2/urunner/test/config_test/test_suite3.yaml diff --git a/static_core/tests/tests-u-runner-2/runner/test/config_test/test_suite_config_test0.py b/static_core/tests/tests-u-runner-2/urunner/test/config_test/test_suite_config_test0.py similarity index 88% rename from static_core/tests/tests-u-runner-2/runner/test/config_test/test_suite_config_test0.py rename to static_core/tests/tests-u-runner-2/urunner/test/config_test/test_suite_config_test0.py index 704787015408960f94587222dc80afd102812d2d..020fe48e5a615d3787cbb854ef59c04f7225297c 100644 --- a/static_core/tests/tests-u-runner-2/runner/test/config_test/test_suite_config_test0.py +++ b/static_core/tests/tests-u-runner-2/urunner/test/config_test/test_suite_config_test0.py @@ -18,11 +18,11 @@ import os import unittest from pathlib import Path -from runner.options.options import IOptions -from runner.options.options_general import GeneralOptions -from runner.options.options_test_suite import TestSuiteOptions -from runner.options.options_workflow import WorkflowOptions -from runner.test.config_test import data_test_suite0 +from urunner.runner.options.options import IOptions +from urunner.runner.options.options_general import GeneralOptions +from urunner.runner.options.options_test_suite import TestSuiteOptions +from urunner.runner.options.options_workflow import WorkflowOptions +from urunner.test.config_test import data_test_suite0 class TestSuiteConfigTest0(unittest.TestCase): diff --git a/static_core/tests/tests-u-runner-2/runner/test/config_test/test_suite_config_test1.py b/static_core/tests/tests-u-runner-2/urunner/test/config_test/test_suite_config_test1.py similarity index 92% rename from static_core/tests/tests-u-runner-2/runner/test/config_test/test_suite_config_test1.py rename to static_core/tests/tests-u-runner-2/urunner/test/config_test/test_suite_config_test1.py index d315f04401a0450e17918afb5d45840e80e2953e..e79a5eb132cf40c7246807ffa5bd210879842711 100644 --- a/static_core/tests/tests-u-runner-2/runner/test/config_test/test_suite_config_test1.py +++ b/static_core/tests/tests-u-runner-2/urunner/test/config_test/test_suite_config_test1.py @@ -19,11 +19,11 @@ import shutil import unittest from pathlib import Path -from runner.common_exceptions import InvalidConfiguration -from runner.options import cli_options_utils as cli_utils -from runner.options.cli_options import CliOptionsParser, CliParserBuilder, ConfigsLoader -from runner.test.config_test import data_1, data_2 -from runner.test.test_utils import compare_dicts +from urunner.runner.common_exceptions import InvalidConfiguration +from urunner.runner.options import cli_options_utils as cli_utils +from urunner.runner.options.cli_options import CliOptionsParser, CliParserBuilder, ConfigsLoader +from urunner.test.config_test import data_1, data_2 +from urunner.test.test_utils import compare_dicts class TestSuiteConfigTest1(unittest.TestCase): @@ -33,7 +33,7 @@ class TestSuiteConfigTest1(unittest.TestCase): test_suite_name = "test_suite1" test_suite_path: Path current_path = Path(__file__).parent - cfg_path = current_path.parent.parent.parent.joinpath("cfg") + cfg_path = current_path.parent.parent.joinpath("cfg") @classmethod def setUpClass(cls) -> None: diff --git a/static_core/tests/tests-u-runner-2/runner/test/config_test/test_suite_config_test2.py b/static_core/tests/tests-u-runner-2/urunner/test/config_test/test_suite_config_test2.py similarity index 95% rename from static_core/tests/tests-u-runner-2/runner/test/config_test/test_suite_config_test2.py rename to static_core/tests/tests-u-runner-2/urunner/test/config_test/test_suite_config_test2.py index c647a57e2be912c24a98a48045bfe7654bbf02c3..c6d6f969cd550f811ddb3aa7bb5e267da19d2e7b 100644 --- a/static_core/tests/tests-u-runner-2/runner/test/config_test/test_suite_config_test2.py +++ b/static_core/tests/tests-u-runner-2/urunner/test/config_test/test_suite_config_test2.py @@ -22,11 +22,11 @@ from pathlib import Path from typing import cast from unittest.mock import patch -from runner.common_exceptions import InvalidConfiguration -from runner.enum_types.base_enum import IncorrectEnumValue -from runner.enum_types.verbose_format import VerboseKind -from runner.options import cli_options_utils as cli_utils -from runner.options.cli_options import CliOptions, CliOptionsParser, CliParserBuilder, ConfigsLoader +from urunner.runner.common_exceptions import InvalidConfiguration +from urunner.runner.enum_types.base_enum import IncorrectEnumValue +from urunner.runner.enum_types.verbose_format import VerboseKind +from urunner.runner.options import cli_options_utils as cli_utils +from urunner.runner.options.cli_options import CliOptions, CliOptionsParser, CliParserBuilder, ConfigsLoader class TestSuiteConfigTest2(unittest.TestCase): @@ -36,7 +36,7 @@ class TestSuiteConfigTest2(unittest.TestCase): test_suite_name = "test_suite2" test_suite_path: Path current_path = Path(__file__).parent - cfg_path = current_path.parent.parent.parent.joinpath("cfg") + cfg_path = current_path.parent.parent.joinpath("cfg") @classmethod def setUpClass(cls) -> None: diff --git a/static_core/tests/tests-u-runner-2/runner/test/config_test/test_suite_config_test3.py b/static_core/tests/tests-u-runner-2/urunner/test/config_test/test_suite_config_test3.py similarity index 91% rename from static_core/tests/tests-u-runner-2/runner/test/config_test/test_suite_config_test3.py rename to static_core/tests/tests-u-runner-2/urunner/test/config_test/test_suite_config_test3.py index e4fe4578e26b4537349282b7fff1d28d6cc5a251..3efd394acdb936134b48adc905e4bf8ba59109ea 100644 --- a/static_core/tests/tests-u-runner-2/runner/test/config_test/test_suite_config_test3.py +++ b/static_core/tests/tests-u-runner-2/urunner/test/config_test/test_suite_config_test3.py @@ -20,9 +20,9 @@ import unittest from pathlib import Path from typing import cast -from runner.options.cli_options import CliOptions -from runner.test.config_test import data_collections -from runner.test.test_utils import compare_dicts +from urunner.runner.options.cli_options import CliOptions +from urunner.test.config_test import data_collections +from urunner.test.test_utils import compare_dicts class TestSuiteConfigTest3(unittest.TestCase): @@ -32,7 +32,7 @@ class TestSuiteConfigTest3(unittest.TestCase): test_suite_name = "test_suite3" test_suite_path: Path current_path = Path(__file__).parent - cfg_path = current_path.parent.parent.parent.joinpath("cfg") + cfg_path = current_path.parent.parent.joinpath("cfg") collections = data_collections.collections @classmethod diff --git a/static_core/tests/tests-u-runner-2/runner/test/config_test/workflow_arkjs_config_test.py b/static_core/tests/tests-u-runner-2/urunner/test/config_test/workflow_arkjs_config_test.py similarity index 88% rename from static_core/tests/tests-u-runner-2/runner/test/config_test/workflow_arkjs_config_test.py rename to static_core/tests/tests-u-runner-2/urunner/test/config_test/workflow_arkjs_config_test.py index b604364f99c62ab0f412c294b9abf7d852121dfc..21aa4d0ae5792a270cd3e12d20996c6a4c88b138 100644 --- a/static_core/tests/tests-u-runner-2/runner/test/config_test/workflow_arkjs_config_test.py +++ b/static_core/tests/tests-u-runner-2/urunner/test/config_test/workflow_arkjs_config_test.py @@ -18,12 +18,12 @@ import os import unittest from pathlib import Path -from runner.options.options import IOptions -from runner.options.options_general import GeneralOptions -from runner.options.options_test_suite import TestSuiteOptions -from runner.options.options_workflow import WorkflowOptions -from runner.options.step import StepKind -from runner.test.config_test import data_3 +from urunner.runner.options.options import IOptions +from urunner.runner.options.options_general import GeneralOptions +from urunner.runner.options.options_test_suite import TestSuiteOptions +from urunner.runner.options.options_workflow import WorkflowOptions +from urunner.runner.options.step import StepKind +from urunner.test.config_test import data_3 class WorkflowArkJsConfigTest(unittest.TestCase): @@ -66,7 +66,7 @@ class WorkflowArkJsConfigTest(unittest.TestCase): self.assertEqual(len(echo), 1, "Step 'es2panda' not found") step = echo[0] self.assertEqual(str(step.executable_path), - "runner/extensions/generators/ets_arkjs_xgc/ark_js_napi_cli_runner.sh") + "urunner/runner/extensions/generators/ets_arkjs_xgc/ark_js_napi_cli_runner.sh") self.assertEqual(step.step_kind, StepKind.OTHER) self.assertEqual(step.timeout, 60) self.assertSetEqual(set(step.args), { diff --git a/static_core/tests/tests-u-runner-2/runner/test/config_test/workflow_config_test.py b/static_core/tests/tests-u-runner-2/urunner/test/config_test/workflow_config_test.py similarity index 87% rename from static_core/tests/tests-u-runner-2/runner/test/config_test/workflow_config_test.py rename to static_core/tests/tests-u-runner-2/urunner/test/config_test/workflow_config_test.py index 3dc5582d07ebb083a4c22ccc76eab7b7c9c900fc..17518c84bb5b5326b78a22634c9d42910f5dbb25 100644 --- a/static_core/tests/tests-u-runner-2/runner/test/config_test/workflow_config_test.py +++ b/static_core/tests/tests-u-runner-2/urunner/test/config_test/workflow_config_test.py @@ -18,12 +18,12 @@ import os import unittest from pathlib import Path -from runner.options.options import IOptions -from runner.options.options_general import GeneralOptions -from runner.options.options_test_suite import TestSuiteOptions -from runner.options.options_workflow import WorkflowOptions -from runner.options.step import StepKind -from runner.test.config_test import data_1 +from urunner.runner.options.options import IOptions +from urunner.runner.options.options_general import GeneralOptions +from urunner.runner.options.options_test_suite import TestSuiteOptions +from urunner.runner.options.options_workflow import WorkflowOptions +from urunner.runner.options.step import StepKind +from urunner.test.config_test import data_1 class WorkflowConfigTest(unittest.TestCase): diff --git a/static_core/tests/tests-u-runner-2/runner/test/environment_test/__init__.py b/static_core/tests/tests-u-runner-2/urunner/test/environment_test/__init__.py similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/test/environment_test/__init__.py rename to static_core/tests/tests-u-runner-2/urunner/test/environment_test/__init__.py diff --git a/static_core/tests/tests-u-runner-2/runner/test/environment_test/environment_test.py b/static_core/tests/tests-u-runner-2/urunner/test/environment_test/environment_test.py similarity index 97% rename from static_core/tests/tests-u-runner-2/runner/test/environment_test/environment_test.py rename to static_core/tests/tests-u-runner-2/urunner/test/environment_test/environment_test.py index 4d8d1d0ba1e07ce9927c7f7e91403e78b30819b2..c8e390a701d67e9b16da379ca020096b7d6f8692 100644 --- a/static_core/tests/tests-u-runner-2/runner/test/environment_test/environment_test.py +++ b/static_core/tests/tests-u-runner-2/urunner/test/environment_test/environment_test.py @@ -21,10 +21,10 @@ from typing import cast from unittest import TestCase from unittest.mock import patch -from runner.environment import MandatoryPropDescription, RunnerEnv -from runner.init_runner import InitRunner, MandatoryProp -from runner.test.test_utils import assert_not_raise, random_suffix -from runner.utils import write_2_file +from urunner.runner.environment import MandatoryPropDescription, RunnerEnv +from urunner.runner.init_runner import InitRunner, MandatoryProp +from urunner.runner.test.test_utils import assert_not_raise, random_suffix +from urunner.runner.utils import write_2_file non_existing_path_01: str = str(Path(__file__).parent / "non-exist-01") existing_path_01: str = str(Path(__file__).parent / "env-exist-01") diff --git a/static_core/tests/tests-u-runner-2/runner/test/environment_test/init_cli_test.py b/static_core/tests/tests-u-runner-2/urunner/test/environment_test/init_cli_test.py similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/test/environment_test/init_cli_test.py rename to static_core/tests/tests-u-runner-2/urunner/test/environment_test/init_cli_test.py diff --git a/static_core/tests/tests-u-runner-2/runner/test/environment_test/init_test_01.py b/static_core/tests/tests-u-runner-2/urunner/test/environment_test/init_test_01.py similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/test/environment_test/init_test_01.py rename to static_core/tests/tests-u-runner-2/urunner/test/environment_test/init_test_01.py diff --git a/static_core/tests/tests-u-runner-2/runner/test/environment_test/init_test_02.py b/static_core/tests/tests-u-runner-2/urunner/test/environment_test/init_test_02.py similarity index 98% rename from static_core/tests/tests-u-runner-2/runner/test/environment_test/init_test_02.py rename to static_core/tests/tests-u-runner-2/urunner/test/environment_test/init_test_02.py index 76d97993957d27f457b6a2e23c6a8c4aa002d3f5..9eb3c89af5ca603773a247fbf2200ea405343b44 100644 --- a/static_core/tests/tests-u-runner-2/runner/test/environment_test/init_test_02.py +++ b/static_core/tests/tests-u-runner-2/urunner/test/environment_test/init_test_02.py @@ -17,8 +17,8 @@ from pathlib import Path from unittest import TestCase from unittest.mock import MagicMock, patch -from runner.init_runner import InitRunner -from runner.test.test_utils import random_suffix +from urunner.runner.init_runner import InitRunner +from urunner.test.test_utils import random_suffix non_existing_path_01: str = str(Path(__file__).parent / "non-exist-01") not_path_01: str = "not-path-01" diff --git a/static_core/tests/tests-u-runner-2/runner/test/launches_test/__init__.py b/static_core/tests/tests-u-runner-2/urunner/test/launches_test/__init__.py similarity index 99% rename from static_core/tests/tests-u-runner-2/runner/test/launches_test/__init__.py rename to static_core/tests/tests-u-runner-2/urunner/test/launches_test/__init__.py index 9732ca4f2eac1b497ade4e5a321b4b68f540d3c6..4089df1c50309112fc9b0153f8d8f076498feeaa 100644 --- a/static_core/tests/tests-u-runner-2/runner/test/launches_test/__init__.py +++ b/static_core/tests/tests-u-runner-2/urunner/test/launches_test/__init__.py @@ -13,3 +13,4 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# diff --git a/static_core/tests/tests-u-runner-2/runner/test/launches_test/data/dependent_test2.ets b/static_core/tests/tests-u-runner-2/urunner/test/launches_test/data/dependent_test2.ets similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/test/launches_test/data/dependent_test2.ets rename to static_core/tests/tests-u-runner-2/urunner/test/launches_test/data/dependent_test2.ets diff --git a/static_core/tests/tests-u-runner-2/runner/test/launches_test/data/panda.yaml b/static_core/tests/tests-u-runner-2/urunner/test/launches_test/data/panda.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/test/launches_test/data/panda.yaml rename to static_core/tests/tests-u-runner-2/urunner/test/launches_test/data/panda.yaml diff --git a/static_core/tests/tests-u-runner-2/runner/test/launches_test/data/test1.ets b/static_core/tests/tests-u-runner-2/urunner/test/launches_test/data/test1.ets similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/test/launches_test/data/test1.ets rename to static_core/tests/tests-u-runner-2/urunner/test/launches_test/data/test1.ets diff --git a/static_core/tests/tests-u-runner-2/runner/test/launches_test/data/test2.ets b/static_core/tests/tests-u-runner-2/urunner/test/launches_test/data/test2.ets similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/test/launches_test/data/test2.ets rename to static_core/tests/tests-u-runner-2/urunner/test/launches_test/data/test2.ets diff --git a/static_core/tests/tests-u-runner-2/runner/test/launches_test/data/test_suite1.yaml b/static_core/tests/tests-u-runner-2/urunner/test/launches_test/data/test_suite1.yaml similarity index 100% rename from static_core/tests/tests-u-runner-2/runner/test/launches_test/data/test_suite1.yaml rename to static_core/tests/tests-u-runner-2/urunner/test/launches_test/data/test_suite1.yaml diff --git a/static_core/tests/tests-u-runner-2/runner/test/launches_test/options_test.py b/static_core/tests/tests-u-runner-2/urunner/test/launches_test/options_test.py similarity index 87% rename from static_core/tests/tests-u-runner-2/runner/test/launches_test/options_test.py rename to static_core/tests/tests-u-runner-2/urunner/test/launches_test/options_test.py index af916b87e643e72eb6fa5d9a8bca77529f38a174..b0e792e12dd592c3c61e917407b118c71bc89139 100644 --- a/static_core/tests/tests-u-runner-2/runner/test/launches_test/options_test.py +++ b/static_core/tests/tests-u-runner-2/urunner/test/launches_test/options_test.py @@ -25,15 +25,15 @@ from unittest.mock import patch import pytz -from runner.code_coverage.coverage_manager import CoverageManager -from runner.enum_types.params import TestEnv -from runner.options.cli_options import get_args -from runner.options.config import Config -from runner.options.options import IOptions -from runner.options.step import StepKind -from runner.suites.test_standard_flow import TestStandardFlow -from runner.suites.work_dir import WorkDir -from runner.test.test_utils import random_suffix +from urunner.runner.code_coverage.coverage_manager import CoverageManager +from urunner.runner.enum_types.params import TestEnv +from urunner.runner.options.cli_options import get_args +from urunner.runner.options.config import Config +from urunner.runner.options.options import IOptions +from urunner.runner.options.step import StepKind +from urunner.runner.suites.test_standard_flow import TestStandardFlow +from urunner.runner.suites.work_dir import WorkDir +from urunner.runner.test.test_utils import random_suffix class KeyValueType(NamedTuple): @@ -101,8 +101,8 @@ class OptionsTest(TestCase): self.assertEqual(len(parts), 1 + len(checked)) self.assertTrue(all(self.compare_list(parts[1:], checked))) - @patch('runner.utils.get_config_workflow_folder', lambda: OptionsTest.data_folder) - @patch('runner.utils.get_config_test_suite_folder', lambda: OptionsTest.data_folder) + @patch('urunner.runner.utils.get_config_workflow_folder', lambda: OptionsTest.data_folder) + @patch('urunner.runner.utils.get_config_test_suite_folder', lambda: OptionsTest.data_folder) @patch('sys.argv', ["runner.sh", "panda", "test_suite1"]) @patch.dict(os.environ, { 'ARKCOMPILER_RUNTIME_CORE_PATH': ".", @@ -110,7 +110,7 @@ class OptionsTest(TestCase): 'PANDA_BUILD': ".", 'WORK_DIR': f"work-{random_suffix()}" }, clear=True) - @patch('runner.options.local_env.LocalEnv.get_instance_id', lambda: "111111111") + @patch('urunner.runner.options.local_env.LocalEnv.get_instance_id', lambda: "111111111") def test_workflow_panda(self) -> None: # preparation test_env, test_root, work_dir = self.prepare() @@ -140,8 +140,8 @@ class OptionsTest(TestCase): # clear up shutil.rmtree(work_dir.root, ignore_errors=True) - @patch('runner.utils.get_config_workflow_folder', lambda: OptionsTest.data_folder) - @patch('runner.utils.get_config_test_suite_folder', lambda: OptionsTest.data_folder) + @patch('urunner.runner.utils.get_config_workflow_folder', lambda: OptionsTest.data_folder) + @patch('urunner.runner.utils.get_config_test_suite_folder', lambda: OptionsTest.data_folder) @patch('sys.argv', ["runner.sh", "panda", "test_suite1", "--is-panda", "False"]) @patch.dict(os.environ, { 'ARKCOMPILER_RUNTIME_CORE_PATH': ".", @@ -149,7 +149,7 @@ class OptionsTest(TestCase): 'PANDA_BUILD': ".", 'WORK_DIR': f"work-{random_suffix()}" }, clear=True) - @patch('runner.options.local_env.LocalEnv.get_instance_id', lambda: "999999999") + @patch('urunner.runner.options.local_env.LocalEnv.get_instance_id', lambda: "999999999") def test_workflow_not_panda(self) -> None: # preparation test_env, test_root, work_dir = self.prepare() @@ -181,8 +181,8 @@ class OptionsTest(TestCase): # clear up shutil.rmtree(work_dir.root, ignore_errors=True) - @patch('runner.utils.get_config_workflow_folder', lambda: OptionsTest.data_folder) - @patch('runner.utils.get_config_test_suite_folder', lambda: OptionsTest.data_folder) + @patch('urunner.runner.utils.get_config_workflow_folder', lambda: OptionsTest.data_folder) + @patch('urunner.runner.utils.get_config_test_suite_folder', lambda: OptionsTest.data_folder) @patch('sys.argv', ["runner.sh", "panda", "test_suite1"]) @patch.dict(os.environ, { 'ARKCOMPILER_RUNTIME_CORE_PATH': ".", @@ -190,7 +190,7 @@ class OptionsTest(TestCase): 'PANDA_BUILD': ".", 'WORK_DIR': f"work-{random_suffix()}" }, clear=True) - @patch('runner.options.local_env.LocalEnv.get_instance_id', lambda: "222222222") + @patch('urunner.runner.options.local_env.LocalEnv.get_instance_id', lambda: "222222222") def test_workflow_panda_multiple(self) -> None: # preparation test_env, test_root, work_dir = self.prepare() diff --git a/static_core/tests/tests-u-runner-2/runner/test/metadata_test/__init__.py b/static_core/tests/tests-u-runner-2/urunner/test/metadata_test/__init__.py similarity index 99% rename from static_core/tests/tests-u-runner-2/runner/test/metadata_test/__init__.py rename to static_core/tests/tests-u-runner-2/urunner/test/metadata_test/__init__.py index 9732ca4f2eac1b497ade4e5a321b4b68f540d3c6..4089df1c50309112fc9b0153f8d8f076498feeaa 100644 --- a/static_core/tests/tests-u-runner-2/runner/test/metadata_test/__init__.py +++ b/static_core/tests/tests-u-runner-2/urunner/test/metadata_test/__init__.py @@ -13,3 +13,4 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# diff --git a/static_core/tests/tests-u-runner-2/runner/test/metadata_test/metadata_test.py b/static_core/tests/tests-u-runner-2/urunner/test/metadata_test/metadata_test.py similarity index 98% rename from static_core/tests/tests-u-runner-2/runner/test/metadata_test/metadata_test.py rename to static_core/tests/tests-u-runner-2/urunner/test/metadata_test/metadata_test.py index 630c9f69e29e5e89bf517c126bd2c3e0768cec0a..2931770f5da47f31f6b754d0ce5076f91168ea42 100644 --- a/static_core/tests/tests-u-runner-2/runner/test/metadata_test/metadata_test.py +++ b/static_core/tests/tests-u-runner-2/urunner/test/metadata_test/metadata_test.py @@ -19,7 +19,7 @@ import unittest from pathlib import Path from typing import cast -from runner.suites.test_metadata import TestMetadata +from urunner.runner.suites.test_metadata import TestMetadata class MetadataTest(unittest.TestCase): diff --git a/static_core/tests/tests-u-runner-2/runner/test/test_utils.py b/static_core/tests/tests-u-runner-2/urunner/test/test_utils.py similarity index 97% rename from static_core/tests/tests-u-runner-2/runner/test/test_utils.py rename to static_core/tests/tests-u-runner-2/urunner/test/test_utils.py index 01686ddbc451611c6a179426769549f903aaa265..8e1148492d07e4771eb0f2a59a27d71dde806938 100644 --- a/static_core/tests/tests-u-runner-2/runner/test/test_utils.py +++ b/static_core/tests/tests-u-runner-2/urunner/test/test_utils.py @@ -18,8 +18,8 @@ import unittest from collections.abc import Callable from typing import Any, TypeVar -from runner import utils -from runner.common_exceptions import InvalidConfiguration +from urunner.runner import utils +from urunner.runner.common_exceptions import InvalidConfiguration MethodType = Any # type: ignore[explicit-any] CLASSTYPE = TypeVar("CLASSTYPE", bound='object')