Skip to content

testing: Unify component integration tests structure#199

Merged
PiotrKorkus merged 1 commit intoeclipse-score:mainfrom
qorix-group:igorostrowskiq_unify_cit_structure
Jan 19, 2026
Merged

testing: Unify component integration tests structure#199
PiotrKorkus merged 1 commit intoeclipse-score:mainfrom
qorix-group:igorostrowskiq_unify_cit_structure

Conversation

@igorostrowskiq
Copy link
Contributor

No description provided.

@github-actions
Copy link

github-actions bot commented Dec 16, 2025

License Check Results

🚀 The license check job ran with the Bazel command:

bazel run //:license-check

Status: ⚠️ Needs Review

Click to expand output
[License Check Output]
Extracting Bazel installation...
Starting local Bazel server (8.3.0) and connecting to it...
INFO: Invocation ID: fa50008f-dbf5-470b-b62d-2b49a5c881b5
Computing main repo mapping: 
Computing main repo mapping: 
Computing main repo mapping: 
Computing main repo mapping: 
DEBUG: Rule 'rust_qnx8_toolchain+' indicated that a canonical reproducible form can be obtained by modifying arguments integrity = "sha256-oEubHgeZDdT0svMmBKJx7c3/2TdSI/vfwRUyDn+TPGA="
DEBUG: Repository rust_qnx8_toolchain+ instantiated at:
  <builtin>: in <toplevel>
Repository rule http_archive defined at:
  /home/runner/.bazel/external/bazel_tools/tools/build_defs/repo/http.bzl:394:31: in <toplevel>
Computing main repo mapping: 
Computing main repo mapping: 
Computing main repo mapping: 
Computing main repo mapping: 
Computing main repo mapping: 
Computing main repo mapping: 
Computing main repo mapping: 
Computing main repo mapping: 
WARNING: For repository 'score_process', the root module requires module version score_process@1.3.2, but got score_process@1.4.0 in the resolved dependency graph. Please update the version in your MODULE.bazel or set --check_direct_dependencies=off
Computing main repo mapping: 
Computing main repo mapping: 
Computing main repo mapping: 
Loading: 
Loading: 3 packages loaded
Loading: 3 packages loaded
    currently loading: 
Loading: 3 packages loaded
    currently loading: 
Analyzing: target //:license-check (4 packages loaded, 0 targets configured)
Analyzing: target //:license-check (4 packages loaded, 0 targets configured)

Analyzing: target //:license-check (35 packages loaded, 10 targets configured)

Analyzing: target //:license-check (83 packages loaded, 10 targets configured)

Analyzing: target //:license-check (87 packages loaded, 10 targets configured)

Analyzing: target //:license-check (147 packages loaded, 1178 targets configured)

Analyzing: target //:license-check (151 packages loaded, 2704 targets configured)

Analyzing: target //:license-check (156 packages loaded, 2727 targets configured)

Analyzing: target //:license-check (156 packages loaded, 2727 targets configured)

Analyzing: target //:license-check (156 packages loaded, 2727 targets configured)

Analyzing: target //:license-check (159 packages loaded, 4453 targets configured)

Analyzing: target //:license-check (161 packages loaded, 7422 targets configured)

INFO: Analyzed target //:license-check (162 packages loaded, 9013 targets configured).
[3 / 14] [Prepa] Creating source manifest for @@score_tooling+//dash/tool/formatters:dash_format_converter [for tool] ... (2 actions, 0 running)
INFO: From Generating Dash formatted dependency file ...:
INFO: Successfully converted 62 packages from Cargo.lock to bazel-out/k8-fastbuild/bin/formatted.txt
INFO: Found 1 target...
Target //:license.check.license_check up-to-date:
  bazel-bin/license.check.license_check
  bazel-bin/license.check.license_check.jar
INFO: Elapsed time: 39.197s, Critical Path: 0.31s
INFO: 14 processes: 5 disk cache hit, 9 internal.
INFO: Build completed successfully, 14 total actions
INFO: Running command line: bazel-bin/license.check.license_check ./formatted.txt <args omitted>
usage: org.eclipse.dash.licenses.cli.Main [-batch <int>] [-cd <url>]
       [-confidence <int>] [-ef <url>] [-excludeSources <sources>] [-help] [-lic
       <url>] [-project <shortname>] [-repo <url>] [-review] [-summary <file>]
       [-timeout <seconds>] [-token <token>]

@github-actions
Copy link

The created documentation from the pull request is available at: docu-html

@igorostrowskiq igorostrowskiq force-pushed the igorostrowskiq_unify_cit_structure branch from 3e28bc9 to 9b6691f Compare December 16, 2025 16:44
Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR standardizes the naming and structure of component integration tests across the repository. The main changes include:

  • Renaming test directories from language-prefixed names (rust_test_scenarios, cpp_test_scenarios, python_test_cases) to a unified structure under tests/test_scenarios/{language} and tests/test_cases
  • Updating all build files, configuration files, and documentation to reference the new paths
  • Removing language prefixes from binary and package names for consistency

Reviewed changes

Copilot reviewed 16 out of 41 changed files in this pull request and generated 2 comments.

Show a summary per file
File Description
tests/test_scenarios/rust/Cargo.toml Renamed package from rust_test_scenarios to test_scenarios
tests/test_scenarios/rust/BUILD Updated binary name and visibility path to reflect new directory structure
tests/test_scenarios/cpp/src/test_basic.cpp Updated namespace reference and reformatted braces (Allman style)
tests/test_scenarios/cpp/BUILD Renamed binary from cpp_test_scenarios to test_scenarios
tests/test_cases/tests/conftest.py Updated default target paths to new directory structure
tests/test_cases/requirements.txt.orig Contains unresolved merge conflict markers
tests/test_cases/pyproject.toml Renamed project from python_test_cases to test_cases
tests/test_cases/BUILD Updated all target paths and comments to reference new structure
tests/integration_test_scenarios/init_rpi4.build Updated commented path for QNX rust scenarios
tests/integration_test_scenarios/BUILD Updated commented paths for QNX rust scenarios
tests/README.md Updated all documentation paths and commands to reflect new structure
src/cpp/src/BUILD Updated visibility path for test scenarios
MODULE.bazel Updated requirements lock file path
Cargo.toml Updated workspace member path
BUILD Updated test suite target paths
.github/workflows/component_integration_tests.yml Updated all workflow paths to new structure

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@igorostrowskiq igorostrowskiq force-pushed the igorostrowskiq_unify_cit_structure branch from 9b6691f to 7fbf983 Compare December 16, 2025 17:47
Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 15 out of 40 changed files in this pull request and generated no new comments.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

imho, PYTHONPATH should be added and . removed from import statements in test files

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

PiotrKorkus
PiotrKorkus previously approved these changes Dec 19, 2025
Copy link
Contributor

@PiotrKorkus PiotrKorkus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@igorostrowskiq igorostrowskiq force-pushed the igorostrowskiq_unify_cit_structure branch from 01ef5d7 to a9130f3 Compare December 19, 2025 13:48
@igorostrowskiq
Copy link
Contributor Author

Squashed commits

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will similar changes be introduced to other repositories? Or is it per-repo?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

its already on mains in kyron and ref_int

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should pyproject.toml that's inherently for tests cause formatting changes for a script?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pyproject.toml is centralized python config file so it will influence any python files. We can exclude scripts directory if we want it to be only for tests.

bazel_tools = BazelTools(option_prefix="cpp", build_timeout=build_timeout)
cpp_target_name = session.config.getoption("--cpp-target-name")
bazel_tools.build(cpp_target_name)
bazel_tools.build(cpp_target_name, "--config=per-x86_64-linux")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this a related change? What happened here?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For some time now building cpp version of kvs needs config to be passed. It has been fixed in CICD executions but in order to make python -m pytest --build-scenarios work this change is needed.

pyproject.toml Outdated
"venv",
]

line-length = 120
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is perfectly fine for me! I'd prefer having such change in a separate PR though, if possible.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I can remove all ruff related stuff from pyproject.toml and move it to separate PR. This way I will keep only pytest configs in this PR.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PR with ruff: #213

pytest-metadata
pytest-env
testing-utils @ git+https://github.com/eclipse-score/testing_tools.git@v0.3.0
testing-utils @ git+https://github.com/eclipse-score/testing_tools.git@675395d4088c8eba708e21d9e5c4efbc75f6a6b0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Replace with new version?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

needed changes are not included in newest release yet

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why and what are those changes?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

eclipse-score/testing_tools#14

enables passing extra options to bazel build - allows flag --build-scenarios to use necessary config

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unnecessary reformat.

pytest-metadata
pytest-env
testing-utils @ git+https://github.com/eclipse-score/testing_tools.git@v0.3.0
testing-utils @ git+https://github.com/eclipse-score/testing_tools.git@675395d4088c8eba708e21d9e5c4efbc75f6a6b0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why and what are those changes?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not convinced this file should be part of the repo. Notice that paths are local machine dependent. This file will contribute to a noise on every change.

Copy link
Contributor

@PiotrKorkus PiotrKorkus Jan 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The file itself is needed. You can find it e.g. in docs-as-code https://github.com/eclipse-score/docs-as-code/blob/main/src/requirements.txt (they use .in and .txt, we use .txt and .txt.lock)

Local paths are inserted when automatically generating file with bazel command. Let me check if infra team how to make it look cleaner as in docs-as-code

edit: There is no way to generate this file without local paths in comments. The only way is to manually clean it up before committing.

@arkjedrz arkjedrz force-pushed the igorostrowskiq_unify_cit_structure branch from 7b54870 to f357f46 Compare January 19, 2026 14:18
@arkjedrz arkjedrz force-pushed the igorostrowskiq_unify_cit_structure branch from f357f46 to eb1d61e Compare January 19, 2026 14:21
@PiotrKorkus PiotrKorkus merged commit 6411e65 into eclipse-score:main Jan 19, 2026
14 checks passed
@PiotrKorkus PiotrKorkus deleted the igorostrowskiq_unify_cit_structure branch January 19, 2026 15:48
tizava pushed a commit to etas-contrib/score_persistency that referenced this pull request Jan 23, 2026
…unify_cit_structure

testing: Unify component integration tests structure
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants