From c3a51c0df572007f87ccad435c9b63facad011b9 Mon Sep 17 00:00:00 2001 From: Elizaveta Kozhevnikova Date: Mon, 26 May 2025 15:46:26 +0300 Subject: [PATCH 1/2] URunner2: refactoring proj structure Issue: https://gitee.com/openharmony/arkcompiler_runtime_core/issues/ICAYH5 Testing: All required pre-merge tests passed. Results are available in the ggwatcher. Signed-off-by: Elizaveta Kozhevnikova --- static_core/codecheck_ignore.json | 10 +- static_core/scripts/install-deps-ubuntu | 1 + static_core/tests/tests-u-runner-2/linter.sh | 8 +- static_core/tests/tests-u-runner-2/mypy.ini | 23 ----- .../tests/tests-u-runner-2/pyproject.toml | 99 ++++++++++++++++++- .../tests/tests-u-runner-2/runner-test.sh | 2 +- static_core/tests/tests-u-runner-2/runner.sh | 7 +- .../{runner => urunner}/__init__.py | 0 .../cfg/test-suites/astchecker.yaml | 0 .../cfg/test-suites/declgenparser.yaml | 0 .../cfg/test-suites/ets-cts.yaml | 0 .../cfg/test-suites/ets-es-checked.yaml | 0 .../cfg/test-suites/ets-func-tests.yaml | 0 .../cfg/test-suites/ets-gc-stress.yaml | 0 .../cfg/test-suites/ets-runtime.yaml | 0 .../{ => urunner}/cfg/test-suites/hermes.yaml | 0 .../{ => urunner}/cfg/test-suites/parser.yaml | 0 .../cfg/test-suites/test262.yaml | 0 .../cfg/test-suites/unit-tests.yaml | 0 .../cfg/test-suites/xgc-ts-tests.yaml | 0 .../cfg/workflows/ark-aot-pgo.yaml | 0 .../cfg/workflows/arkjs-int.yaml | 0 .../workflows/arkjs/env_hzjsvm_sample.yaml | 0 .../cfg/workflows/arkjs/hybrid-es2abc.yaml | 0 .../cfg/workflows/arkjs/hybrid.yaml | 0 .../cfg/workflows/arkjs/hzjsvm_vs_panda.yaml | 0 .../cfg/workflows/arkjs/mate60pro.yaml | 0 .../cfg/workflows/arkjs/rk3568.yaml | 0 .../cfg/workflows/arkjs/wf_hzjsvm.yaml | 0 .../cfg/workflows/arkjs/wf_hzjsvm_device.yaml | 0 .../workflows/arkjs/wf_hzjsvm_device_aot.yaml | 0 .../cfg/workflows/hybrid-ark.yaml | 0 .../workflows/hybrid-es2panda-verifier.yaml | 0 .../cfg/workflows/hybrid-panda-int.yaml | 0 .../cfg/workflows/hybrid-panda-jit.yaml | 0 .../cfg/workflows/only-ark-aot.yaml | 0 .../cfg/workflows/only-es2panda.yaml | 0 .../cfg/workflows/only-runtime.yaml | 0 .../cfg/workflows/panda-aot-pgo.yaml | 0 .../cfg/workflows/panda-aot.yaml | 0 .../cfg/workflows/panda-int.yaml | 0 .../cfg/workflows/panda-jit.yaml | 0 .../tests-u-runner-2/{ => urunner}/main.py | 20 ++-- .../{.pylintrc => urunner/ruff.toml} | 31 +----- .../reports => urunner/runner}/__init__.py | 0 .../{ => urunner}/runner/chapters.py | 6 +- .../runner/code_coverage/__init__.py | 0 .../runner/code_coverage/cmd_executor.py | 0 .../runner/code_coverage/coverage_dir.py | 2 +- .../runner/code_coverage/coverage_manager.py | 8 +- .../runner/code_coverage/lcov_tool.py | 4 +- .../runner/code_coverage/llvm_cov_tool.py | 6 +- .../{ => urunner}/runner/common_exceptions.py | 0 .../{ => urunner}/runner/cpumask.py | 6 +- .../{ => urunner}/runner/descriptor.py | 0 .../runner/enum_types/__init__.py | 0 .../runner/enum_types/base_enum.py | 2 +- .../runner/enum_types/config_type.py | 2 +- .../runner/enum_types/configuration_kind.py | 2 +- .../{ => urunner}/runner/enum_types/params.py | 8 +- .../{ => urunner}/runner/enum_types/qemu.py | 2 +- .../runner/enum_types/verbose_format.py | 2 +- .../{ => urunner}/runner/environment.py | 4 +- .../runner/extensions/__init__.py | 0 .../runner/extensions/flows/__init__.py | 0 .../runner/extensions/flows/iflow.py | 2 +- .../runner/extensions/generators/__init__.py | 0 .../ets_arkjs_xgc/ark_js_napi_cli_runner.sh | 0 .../ets_arkjs_xgc/ets_arkjs_xgc_generator.py | 6 +- .../extensions/generators/ets_cts/__init__.py | 0 .../generators/ets_cts/benchmark.py | 10 +- .../generators/ets_cts/copyright.txt | 0 .../ets_cts/ets_templates_generator.py | 8 +- .../extensions/generators/ets_cts/params.py | 2 +- .../extensions/generators/ets_cts/template.py | 10 +- .../generators/ets_cts/test_template.tpl | 0 .../generators/ets_es_checked/__init__.py | 0 .../ets_es_checked_generator.py | 6 +- .../generate-es-checked/.gitignore | 0 .../generate-es-checked/README.md | 0 .../generate-es-checked/main.rb | 0 .../generate-es-checked/package.json | 0 .../generate-es-checked/src/script_module.rb | 0 .../generate-es-checked/src/types.rb | 0 .../generate-es-checked/src/value_dumper.rb | 0 .../templates/template.sts.erb | 0 .../templates/template.ts.erb | 0 .../generate-es-checked/tsconfig.json | 0 .../extensions/generators/hermes/__init__.py | 0 .../generators/hermes/hermes_generator.py | 10 +- .../extensions/generators/igenerator.py | 6 +- .../generators/sts_stdlib/__init__.py | 0 .../sts_stdlib/stdlib_templates_generator.py | 20 ++-- .../extensions/generators/test262/__init__.py | 0 .../generators/test262/test262_generator.py | 12 +-- .../generators/test262/test262harness.js | 0 .../runner/extensions/steps/__init__.py | 0 .../extensions/steps/jit_transformer.py | 0 .../runner/extensions/validators/__init__.py | 0 .../validators/astchecker/__init__.py | 0 .../astchecker/astchecker_validator.py | 12 +-- .../validators/astchecker/util_astchecker.py | 4 +- .../extensions/validators/base_validator.py | 6 +- .../extensions/validators/ivalidator.py | 0 .../{ => urunner}/runner/init_runner.py | 4 +- .../{ => urunner}/runner/logger.py | 2 +- .../{ => urunner}/runner/options/__init__.py | 0 .../runner/options/cli_args_wrapper.py | 2 +- .../runner/options/cli_options.py | 16 +-- .../runner/options/cli_options_utils.py | 8 +- .../{ => urunner}/runner/options/config.py | 12 +-- .../{ => urunner}/runner/options/local_env.py | 4 +- .../{ => urunner}/runner/options/macros.py | 10 +- .../{ => urunner}/runner/options/options.py | 6 +- .../runner/options/options_collections.py | 10 +- .../runner/options/options_coverage.py | 4 +- .../runner/options/options_ets.py | 4 +- .../runner/options/options_general.py | 20 ++-- .../runner/options/options_groups.py | 4 +- .../runner/options/options_report.py | 2 +- .../runner/options/options_test_lists.py | 4 +- .../runner/options/options_test_suite.py | 20 ++-- .../runner/options/options_time_report.py | 2 +- .../runner/options/options_workflow.py | 16 +-- .../{ => urunner}/runner/options/step.py | 16 +-- .../runner/options/yaml_document.py | 4 +- .../runner/reports}/__init__.py | 0 .../runner/reports/detailed_report.py | 8 +- .../reports/detailed_report_template.md | 0 .../{ => urunner}/runner/reports/html_view.py | 10 +- .../runner/reports/index_template.html | 0 .../{ => urunner}/runner/reports/report.py | 14 +-- .../runner/reports/report_format.py | 2 +- .../runner/reports/report_template.html | 0 .../runner/reports/report_template.md | 0 .../runner/reports/standard_view.py | 12 +-- .../{ => urunner}/runner/reports/summary.py | 0 .../{ => urunner}/runner/reports/xml_view.py | 10 +- .../{ => urunner}/runner/runner_base.py | 9 +- .../{ => urunner}/runner/runner_file_based.py | 32 +++--- .../runner/sts_utils}/__init__.py | 0 .../runner/sts_utils/constants.py | 0 .../runner/sts_utils/exceptions.py | 2 +- .../runner/sts_utils/file_structure.py | 2 +- .../runner/sts_utils/metainformation.py | 4 +- .../runner/sts_utils/test_case.py | 2 +- .../runner/sts_utils/test_parameters.py | 6 +- .../{ => urunner}/runner/suites/__init__.py | 0 .../runner/suites/ets-verifier.config | 0 .../runner/suites/one_test_runner.py | 4 +- .../runner/suites/preparation_step.py | 14 +-- .../runner/suites/runner_standard_flow.py | 22 ++--- .../{ => urunner}/runner/suites/step_utils.py | 2 +- .../{ => urunner}/runner/suites/test_lists.py | 14 +-- .../runner/suites/test_metadata.py | 6 +- .../runner/suites/test_standard_flow.py | 26 ++--- .../{ => urunner}/runner/suites/test_suite.py | 22 ++--- .../{ => urunner}/runner/suites/work_dir.py | 4 +- .../{ => urunner}/runner/test_base.py | 16 +-- .../{ => urunner}/runner/utils.py | 8 +- .../test}/__init__.py | 0 .../test/chapters_test}/__init__.py | 0 .../chapters_test/chapters_neg_1_test.yaml | 0 .../chapters_test/chapters_neg_2_test.yaml | 0 .../chapters_test/chapters_neg_3_test.yaml | 0 .../chapters_test/chapters_neg_4_test.yaml | 0 .../test/chapters_test/chapters_neg_test.py | 2 +- .../test/chapters_test/chapters_test.py | 2 +- .../test/chapters_test/chapters_test.yaml | 0 .../urunner/test/config_test/__init__.py | 16 +++ .../test/config_test/cli_options_test1.py | 6 +- .../test/config_test/cli_options_test2.py | 8 +- .../test/config_test/config-1.yaml | 0 .../test/config_test/config-hybrid.yaml | 0 .../test/config_test/data_1.py | 13 +-- .../test/config_test/data_2.py | 13 +-- .../test/config_test/data_3.py | 10 +- .../test/config_test/data_collections.py | 0 .../test/config_test/data_test_suite0.py | 6 +- .../test/config_test/test_suite1.yaml | 0 .../test/config_test/test_suite2.yaml | 0 .../test/config_test/test_suite3.yaml | 0 .../config_test/test_suite_config_test0.py | 10 +- .../config_test/test_suite_config_test1.py | 12 +-- .../config_test/test_suite_config_test2.py | 12 +-- .../config_test/test_suite_config_test3.py | 8 +- .../config_test/workflow_arkjs_config_test.py | 14 +-- .../test/config_test/workflow_config_test.py | 12 +-- .../test/environment_test/__init__.py | 0 .../test/environment_test/environment_test.py | 8 +- .../test/environment_test/init_cli_test.py | 0 .../test/environment_test/init_test_01.py | 0 .../test/environment_test/init_test_02.py | 4 +- .../test/launches_test/__init__.py | 0 .../launches_test/data/dependent_test2.ets | 0 .../test/launches_test/data/panda.yaml | 0 .../test/launches_test/data/test1.ets | 0 .../test/launches_test/data/test2.ets | 0 .../test/launches_test/data/test_suite1.yaml | 0 .../test/launches_test/options_test.py | 36 +++---- .../test/metadata_test/__init__.py | 1 + .../test/metadata_test/metadata_test.py | 2 +- .../{runner => urunner}/test/test_utils.py | 4 +- 203 files changed, 530 insertions(+), 459 deletions(-) delete mode 100644 static_core/tests/tests-u-runner-2/mypy.ini rename static_core/tests/tests-u-runner-2/{runner => urunner}/__init__.py (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/cfg/test-suites/astchecker.yaml (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/cfg/test-suites/declgenparser.yaml (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/cfg/test-suites/ets-cts.yaml (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/cfg/test-suites/ets-es-checked.yaml (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/cfg/test-suites/ets-func-tests.yaml (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/cfg/test-suites/ets-gc-stress.yaml (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/cfg/test-suites/ets-runtime.yaml (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/cfg/test-suites/hermes.yaml (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/cfg/test-suites/parser.yaml (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/cfg/test-suites/test262.yaml (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/cfg/test-suites/unit-tests.yaml (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/cfg/test-suites/xgc-ts-tests.yaml (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/cfg/workflows/ark-aot-pgo.yaml (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/cfg/workflows/arkjs-int.yaml (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/cfg/workflows/arkjs/env_hzjsvm_sample.yaml (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/cfg/workflows/arkjs/hybrid-es2abc.yaml (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/cfg/workflows/arkjs/hybrid.yaml (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/cfg/workflows/arkjs/hzjsvm_vs_panda.yaml (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/cfg/workflows/arkjs/mate60pro.yaml (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/cfg/workflows/arkjs/rk3568.yaml (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/cfg/workflows/arkjs/wf_hzjsvm.yaml (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/cfg/workflows/arkjs/wf_hzjsvm_device.yaml (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/cfg/workflows/arkjs/wf_hzjsvm_device_aot.yaml (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/cfg/workflows/hybrid-ark.yaml (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/cfg/workflows/hybrid-es2panda-verifier.yaml (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/cfg/workflows/hybrid-panda-int.yaml (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/cfg/workflows/hybrid-panda-jit.yaml (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/cfg/workflows/only-ark-aot.yaml (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/cfg/workflows/only-es2panda.yaml (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/cfg/workflows/only-runtime.yaml (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/cfg/workflows/panda-aot-pgo.yaml (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/cfg/workflows/panda-aot.yaml (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/cfg/workflows/panda-int.yaml (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/cfg/workflows/panda-jit.yaml (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/main.py (89%) rename static_core/tests/tests-u-runner-2/{.pylintrc => urunner/ruff.toml} (35%) rename static_core/tests/tests-u-runner-2/{runner/reports => urunner/runner}/__init__.py (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/chapters.py (96%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/code_coverage/__init__.py (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/code_coverage/cmd_executor.py (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/code_coverage/coverage_dir.py (98%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/code_coverage/coverage_manager.py (92%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/code_coverage/lcov_tool.py (98%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/code_coverage/llvm_cov_tool.py (98%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/common_exceptions.py (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/cpumask.py (95%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/descriptor.py (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/enum_types/__init__.py (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/enum_types/base_enum.py (96%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/enum_types/config_type.py (93%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/enum_types/configuration_kind.py (95%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/enum_types/params.py (82%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/enum_types/qemu.py (92%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/enum_types/verbose_format.py (93%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/environment.py (96%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/extensions/__init__.py (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/extensions/flows/__init__.py (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/extensions/flows/iflow.py (95%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/extensions/generators/__init__.py (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/extensions/generators/ets_arkjs_xgc/ark_js_napi_cli_runner.sh (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/extensions/generators/ets_arkjs_xgc/ets_arkjs_xgc_generator.py (95%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/extensions/generators/ets_cts/__init__.py (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/extensions/generators/ets_cts/benchmark.py (89%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/extensions/generators/ets_cts/copyright.txt (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/extensions/generators/ets_cts/ets_templates_generator.py (88%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/extensions/generators/ets_cts/params.py (94%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/extensions/generators/ets_cts/template.py (94%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/extensions/generators/ets_cts/test_template.tpl (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/extensions/generators/ets_es_checked/__init__.py (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/extensions/generators/ets_es_checked/ets_es_checked_generator.py (92%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/extensions/generators/ets_es_checked/generate-es-checked/.gitignore (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/extensions/generators/ets_es_checked/generate-es-checked/README.md (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/extensions/generators/ets_es_checked/generate-es-checked/main.rb (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/extensions/generators/ets_es_checked/generate-es-checked/package.json (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/extensions/generators/ets_es_checked/generate-es-checked/src/script_module.rb (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/extensions/generators/ets_es_checked/generate-es-checked/src/types.rb (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/extensions/generators/ets_es_checked/generate-es-checked/src/value_dumper.rb (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/extensions/generators/ets_es_checked/generate-es-checked/templates/template.sts.erb (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/extensions/generators/ets_es_checked/generate-es-checked/templates/template.ts.erb (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/extensions/generators/ets_es_checked/generate-es-checked/tsconfig.json (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/extensions/generators/hermes/__init__.py (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/extensions/generators/hermes/hermes_generator.py (94%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/extensions/generators/igenerator.py (88%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/extensions/generators/sts_stdlib/__init__.py (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/extensions/generators/sts_stdlib/stdlib_templates_generator.py (88%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/extensions/generators/test262/__init__.py (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/extensions/generators/test262/test262_generator.py (95%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/extensions/generators/test262/test262harness.js (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/extensions/steps/__init__.py (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/extensions/steps/jit_transformer.py (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/extensions/validators/__init__.py (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/extensions/validators/astchecker/__init__.py (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/extensions/validators/astchecker/astchecker_validator.py (90%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/extensions/validators/astchecker/util_astchecker.py (99%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/extensions/validators/base_validator.py (88%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/extensions/validators/ivalidator.py (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/init_runner.py (98%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/logger.py (97%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/options/__init__.py (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/options/cli_args_wrapper.py (96%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/options/cli_options.py (97%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/options/cli_options_utils.py (95%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/options/config.py (79%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/options/local_env.py (94%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/options/macros.py (93%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/options/options.py (96%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/options/options_collections.py (94%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/options/options_coverage.py (98%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/options/options_ets.py (96%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/options/options_general.py (93%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/options/options_groups.py (97%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/options/options_report.py (98%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/options/options_test_lists.py (97%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/options/options_test_suite.py (93%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/options/options_time_report.py (97%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/options/options_workflow.py (95%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/options/step.py (96%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/options/yaml_document.py (95%) rename static_core/tests/tests-u-runner-2/{runner/sts_utils => urunner/runner/reports}/__init__.py (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/reports/detailed_report.py (96%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/reports/detailed_report_template.md (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/reports/html_view.py (93%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/reports/index_template.html (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/reports/report.py (96%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/reports/report_format.py (92%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/reports/report_template.html (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/reports/report_template.md (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/reports/standard_view.py (95%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/reports/summary.py (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/reports/xml_view.py (94%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/runner_base.py (96%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/runner_file_based.py (88%) rename static_core/tests/tests-u-runner-2/{runner/test => urunner/runner/sts_utils}/__init__.py (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/sts_utils/constants.py (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/sts_utils/exceptions.py (95%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/sts_utils/file_structure.py (99%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/sts_utils/metainformation.py (94%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/sts_utils/test_case.py (92%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/sts_utils/test_parameters.py (90%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/suites/__init__.py (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/suites/ets-verifier.config (100%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/suites/one_test_runner.py (98%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/suites/preparation_step.py (94%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/suites/runner_standard_flow.py (91%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/suites/step_utils.py (97%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/suites/test_lists.py (95%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/suites/test_metadata.py (97%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/suites/test_standard_flow.py (95%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/suites/test_suite.py (96%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/suites/work_dir.py (93%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/test_base.py (93%) rename static_core/tests/tests-u-runner-2/{ => urunner}/runner/utils.py (98%) rename static_core/tests/tests-u-runner-2/{runner/test/chapters_test => urunner/test}/__init__.py (100%) rename static_core/tests/tests-u-runner-2/{runner/test/config_test => urunner/test/chapters_test}/__init__.py (100%) rename static_core/tests/tests-u-runner-2/{runner => urunner}/test/chapters_test/chapters_neg_1_test.yaml (100%) rename static_core/tests/tests-u-runner-2/{runner => urunner}/test/chapters_test/chapters_neg_2_test.yaml (100%) rename static_core/tests/tests-u-runner-2/{runner => urunner}/test/chapters_test/chapters_neg_3_test.yaml (100%) rename static_core/tests/tests-u-runner-2/{runner => urunner}/test/chapters_test/chapters_neg_4_test.yaml (100%) rename static_core/tests/tests-u-runner-2/{runner => urunner}/test/chapters_test/chapters_neg_test.py (96%) rename static_core/tests/tests-u-runner-2/{runner => urunner}/test/chapters_test/chapters_test.py (99%) rename static_core/tests/tests-u-runner-2/{runner => urunner}/test/chapters_test/chapters_test.yaml (100%) create mode 100644 static_core/tests/tests-u-runner-2/urunner/test/config_test/__init__.py rename static_core/tests/tests-u-runner-2/{runner => urunner}/test/config_test/cli_options_test1.py (97%) rename static_core/tests/tests-u-runner-2/{runner => urunner}/test/config_test/cli_options_test2.py (97%) rename static_core/tests/tests-u-runner-2/{runner => urunner}/test/config_test/config-1.yaml (100%) rename static_core/tests/tests-u-runner-2/{runner => urunner}/test/config_test/config-hybrid.yaml (100%) rename static_core/tests/tests-u-runner-2/{runner => urunner}/test/config_test/data_1.py (89%) rename static_core/tests/tests-u-runner-2/{runner => urunner}/test/config_test/data_2.py (89%) rename static_core/tests/tests-u-runner-2/{runner => urunner}/test/config_test/data_3.py (91%) rename static_core/tests/tests-u-runner-2/{runner => urunner}/test/config_test/data_collections.py (100%) rename static_core/tests/tests-u-runner-2/{runner => urunner}/test/config_test/data_test_suite0.py (94%) rename static_core/tests/tests-u-runner-2/{runner => urunner}/test/config_test/test_suite1.yaml (100%) rename static_core/tests/tests-u-runner-2/{runner => urunner}/test/config_test/test_suite2.yaml (100%) rename static_core/tests/tests-u-runner-2/{runner => urunner}/test/config_test/test_suite3.yaml (100%) rename static_core/tests/tests-u-runner-2/{runner => urunner}/test/config_test/test_suite_config_test0.py (88%) rename static_core/tests/tests-u-runner-2/{runner => urunner}/test/config_test/test_suite_config_test1.py (92%) rename static_core/tests/tests-u-runner-2/{runner => urunner}/test/config_test/test_suite_config_test2.py (95%) rename static_core/tests/tests-u-runner-2/{runner => urunner}/test/config_test/test_suite_config_test3.py (91%) rename static_core/tests/tests-u-runner-2/{runner => urunner}/test/config_test/workflow_arkjs_config_test.py (88%) rename static_core/tests/tests-u-runner-2/{runner => urunner}/test/config_test/workflow_config_test.py (87%) rename static_core/tests/tests-u-runner-2/{runner => urunner}/test/environment_test/__init__.py (100%) rename static_core/tests/tests-u-runner-2/{runner => urunner}/test/environment_test/environment_test.py (97%) rename static_core/tests/tests-u-runner-2/{runner => urunner}/test/environment_test/init_cli_test.py (100%) rename static_core/tests/tests-u-runner-2/{runner => urunner}/test/environment_test/init_test_01.py (100%) rename static_core/tests/tests-u-runner-2/{runner => urunner}/test/environment_test/init_test_02.py (98%) rename static_core/tests/tests-u-runner-2/{runner => urunner}/test/launches_test/__init__.py (100%) rename static_core/tests/tests-u-runner-2/{runner => urunner}/test/launches_test/data/dependent_test2.ets (100%) rename static_core/tests/tests-u-runner-2/{runner => urunner}/test/launches_test/data/panda.yaml (100%) rename static_core/tests/tests-u-runner-2/{runner => urunner}/test/launches_test/data/test1.ets (100%) rename static_core/tests/tests-u-runner-2/{runner => urunner}/test/launches_test/data/test2.ets (100%) rename static_core/tests/tests-u-runner-2/{runner => urunner}/test/launches_test/data/test_suite1.yaml (100%) rename static_core/tests/tests-u-runner-2/{runner => urunner}/test/launches_test/options_test.py (87%) rename static_core/tests/tests-u-runner-2/{runner => urunner}/test/metadata_test/__init__.py (99%) rename static_core/tests/tests-u-runner-2/{runner => urunner}/test/metadata_test/metadata_test.py (98%) rename static_core/tests/tests-u-runner-2/{runner => urunner}/test/test_utils.py (97%) diff --git a/static_core/codecheck_ignore.json b/static_core/codecheck_ignore.json index a5acf04034..95d2a34c02 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 2b12c17ac8..881655bc83 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/linter.sh b/static_core/tests/tests-u-runner-2/linter.sh index 1ad1dc2404..1e47e046a7 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 5453cd04aa..0000000000 --- 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 923266a35a..b6413c81d2 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 7abfe593e6..aabbb640bd 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 c3a4cbf188..75de0517c4 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 d5392b9efb..2f541c2521 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/.pylintrc b/static_core/tests/tests-u-runner-2/urunner/ruff.toml similarity index 35% rename from static_core/tests/tests-u-runner-2/.pylintrc rename to static_core/tests/tests-u-runner-2/urunner/ruff.toml index 939a44ac05..104bd59020 100644 --- a/static_core/tests/tests-u-runner-2/.pylintrc +++ b/static_core/tests/tests-u-runner-2/urunner/ruff.toml @@ -11,32 +11,5 @@ # 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 +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 2aea9d2c8f..c7426d450a 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 cd1c4b45b7..0aab2025f1 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 d14cc9fbb8..0da1fa2fea 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 142d7bb3c3..347e81e7b9 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 a7428a0def..5a2e2bdfca 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 f6b2dc2358..4c7ab08657 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 c2a0cb19b7..042d1a9eaf 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 e130368bc2..3e94bdb48d 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 0233a75428..d2a2331b49 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 b2580a04cf..0e96bea0c1 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 668c0a4c33..7a74230630 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 7a01830e2d..7e93d24d14 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 779f6d8e4c..9fc546642f 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 c372252c3f..2e593672de 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 497afbac16..e5c5d8e33e 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 9d770e3b14..e67da5a34f 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 72b3cb590a..18ce9769de 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 08d8f4297f..9e6f71270a 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 2f11e699ce..245322bcac 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 fa57ba1db5..28868893e8 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 5146a6a762..284e6cc270 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 70c751bc53..a68b4b5409 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 b1f00f32ee..c73dd7e25e 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 4b6e7d07bf..a2e1dc5eb0 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 cac3f368e9..84e093fb00 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 66fe02b1c4..73ab7e85e3 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 8f0f562512..e6ba56dfea 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 9ec30525f9..0da79c1e70 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 966e1965d6..480c5c0502 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 14198b6030..8d0e08f0fd 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 b8d2f9c5e2..9775dd27e2 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 c69c9a8870..a5c9bd0e44 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 6298da29a3..f7e8b0c8b1 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 454f5f2c1f..af06b554e6 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 51f09190e6..ea49223463 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 1ae193a55a..c2b1a7418a 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 f09f8b7b2b..3ae089995e 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 7134274110..48058332ca 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 2b04a8c1d0..0136b938e6 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 a937cfc03c..fdafd3b7a0 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 4084561222..ba86b79413 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 9d9514ff8b..79940d0673 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 39e6a9c1e0..1758021fa1 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 88377febff..82235efd9f 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 b40aec3326..8b6742f1a0 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 3da1c453ec..861d221550 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 ecfc6f4154..ebf0396504 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 d7082b3a90..80c0b8e176 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 1e5bccb1dd..40231a1382 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 23de231347..18cfb29e8d 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 e1706cb0fb..720e61840f 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 82afdebf80..2dccee97a1 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 f16dff265c..7f0e338a27 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 99042625fe..175cd573ec 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 1fc58badc1..7bf8dd0ffd 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 999acd8076..3a850c244d 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 a81c06cb59..cf41d3fcd5 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 fdf5bb0844..0c534446bf 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 06bda99c78..e81f937ec8 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 4f9491756b..75416112ac 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 925d11a4fe..79de90342e 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 bca6f4314e..41a68f1423 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 0c6b14c153..acf8cb5ccb 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 9ed1d37ba6..8f285ecff7 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 011491ac3f..4e1f74eb37 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 300f1e835f..983f32d3a6 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 619d6fdf56..3528eb1f09 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 e053b7d60c..3ce883c808 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 416735264d..cc2d134e23 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 ec32a70207..6b703e1499 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 7c26cd9e6e..2dc4bfa2a8 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 4bfa298bd1..d45a196301 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 100% 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 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 8652088c5b..f588863a26 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 2fb3ce290d..e8adc3998c 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 0000000000..a38fde8d57 --- /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 4d895049ba..d8f14d1c14 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 5f2e677687..3e99e6511c 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 882a2f574e..23df2db263 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 294e21cb1d..6c313c2856 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 4ad226d1ee..c57269097f 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 57d1578fd6..472d64d6b2 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 7047870154..020fe48e5a 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 d315f04401..e79a5eb132 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 c647a57e2b..c6d6f969cd 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 e4fe4578e2..3efd394acd 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 b604364f99..21aa4d0ae5 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 3dc5582d07..17518c84bb 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 4d8d1d0ba1..c8e390a701 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 76d9799395..9eb3c89af5 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 100% 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 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 af916b87e6..b0e792e12d 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 9732ca4f2e..4089df1c50 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 630c9f69e2..2931770f5d 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 01686ddbc4..8e1148492d 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') -- Gitee From c7d247d3f381982059211aea114433b9dc6824b8 Mon Sep 17 00:00:00 2001 From: Elizaveta Kozhevnikova Date: Mon, 26 May 2025 15:46:26 +0300 Subject: [PATCH 2/2] URunner2: refactoring proj structure Issue: https://gitee.com/openharmony/arkcompiler_runtime_core/issues/ICAYH5 Testing: All required pre-merge tests passed. Results are available in the ggwatcher. Signed-off-by: Elizaveta Kozhevnikova --- .../tests-u-runner-2/urunner/test/chapters_test/__init__.py | 1 + .../tests-u-runner-2/urunner/test/launches_test/__init__.py | 1 + 2 files changed, 2 insertions(+) diff --git a/static_core/tests/tests-u-runner-2/urunner/test/chapters_test/__init__.py b/static_core/tests/tests-u-runner-2/urunner/test/chapters_test/__init__.py index 4f521bb54b..a38fde8d57 100644 --- a/static_core/tests/tests-u-runner-2/urunner/test/chapters_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/urunner/test/launches_test/__init__.py b/static_core/tests/tests-u-runner-2/urunner/test/launches_test/__init__.py index 9732ca4f2e..4089df1c50 100644 --- a/static_core/tests/tests-u-runner-2/urunner/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. +# -- Gitee