testing: refactor CIT structure and cleanup

.github/workflows/component_integration_tests.yml

@@ -43,7 +43,7 @@ jobs:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build Rust test scenarios
-        working-directory: component_integration_tests/rust_test_scenarios
+        working-directory: tests/test_scenarios/rust
         run: cargo build
 
       - name: Set up Python 3
@@ -52,15 +52,13 @@ jobs:
           python-version: '3.12'
 
       - name: Set up Python virtual environment
-        working-directory: component_integration_tests/python_test_cases
         run: |
           python -m venv .venv
           source .venv/bin/activate
-          pip install -r requirements.txt
+          pip install -r tests/test_cases/requirements.txt
 
       - name: Run Python tests with pytest (PR)
         if: github.event_name == 'pull_request' || github.event_name == 'push'
-        working-directory: component_integration_tests/python_test_cases
         run: |
           source .venv/bin/activate
           python -m pytest --traces=all
@@ -69,7 +67,6 @@ jobs:
         if: github.event_name == 'schedule'
         env:
           NIGHTLY: TRUE
-        working-directory: component_integration_tests/python_test_cases
         run: |
           source .venv/bin/activate
           python -m pytest --traces=all --count=20 --repeat-scope=session

.github/workflows/component_integration_tests_bazel.yml

@@ -69,16 +69,16 @@ jobs:
 
       - name: Build Test Scenarios with Bazel
         run: |
-          bazel build //component_integration_tests/rust_test_scenarios:rust_test_scenarios
+          bazel build //tests/test_scenarios/rust:test_scenarios
 
       - name: Build Test Scenarios with Bazel (PR)
         if: github.event_name == 'pull_request' || github.event_name == 'push'
         run: |
-          bazel test //component_integration_tests/python_test_cases:cit
+          bazel test //tests/test_cases:cit
 
       - name: Build Test Scenarios with Bazel (Nightly)
         if: github.event_name == 'schedule'
         env:
           NIGHTLY: TRUE
         run: |
-          bazel test //component_integration_tests/python_test_cases:cit_repeat --test_timeout=1200
+          bazel test //tests/test_cases:cit_repeat --test_timeout=1200

.gitignore

@@ -64,8 +64,8 @@ target/
 .*swo
 
 # Pytest reports
-component_integration_tests/python_test_cases/*.html
-component_integration_tests/python_test_cases/*.xml
+tests/test_cases/*.html
+tests/test_cases/*.xml
 
 #vscode
 .vscode*

BUILD

@@ -23,7 +23,6 @@ copyright_checker(
     name = "copyright",
     srcs = [
         ".github",
-        "component_integration_tests",
         "docs",
         "internal_docs",
         "patches",
@@ -101,6 +100,6 @@ test_suite(
     name = "cit_tests",
     testonly = True,
     tests = [
-        "//component_integration_tests/python_test_cases:cit",
+        "//tests/test_cases:cit",
     ],
 )

Cargo.toml

@@ -8,7 +8,7 @@ default-members = ["src/orchestration", "src/orchestration_macros", "src/xtask"]
 members = [
     "src/orchestration",
     "src/xtask",
-    "component_integration_tests/rust_test_scenarios",
+    "tests/test_scenarios/rust",
     "src/orchestration/examples/camera_drv_object_det",
     "src/orchestration_macros",
 ]

MODULE.bazel

@@ -105,7 +105,7 @@ pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip", dev_depen
 pip.parse(
     hub_name = "pip_score_venv_test",
     python_version = PYTHON_VERSION,
-    requirements_lock = "//component_integration_tests/python_test_cases:requirements.txt.lock",
+    requirements_lock = "//tests/test_cases:requirements.txt.lock",
 )
 
 use_repo(python)

README.md

@@ -2,8 +2,8 @@
 
 Repository for **Orchestration framework**
 
-[![Nightly CIT](../../actions/workflows/component_integration_tests.yml/badge.svg)](../../actions/workflows/component_integration_tests.yml)
-[![Nightly CIT (Bazel)](../../actions/workflows/component_integration_tests_bazel.yml/badge.svg)](../../actions/workflows/component_integration_tests_bazel.yml)
+[![Nightly CIT](../../actions/workflows/tests.yml/badge.svg)](../../actions/workflows/tests.yml)
+[![Nightly CIT (Bazel)](../../actions/workflows/tests_bazel.yml/badge.svg)](../../actions/workflows/tests_bazel.yml)
 
 
 ## Feature status and roadmap

.ruff.toml → pyproject.toml

@@ -1,3 +1,21 @@
+[tool.pytest]
+addopts = ["-v"]
+pythonpath = [
+    "tests/test_cases",
+    "tests/test_cases/tests",
+]
+testpaths = ["tests/test_cases/tests"]
+markers = [
+    "root_required",  # root permissions are required for this test
+    "do_not_repeat",  # do not repeat this test when using pytest-repeat
+    "only_nightly",  # run this test only in nightly runs
+]
+junit_log_passing_tests = true
+
+[tool.pytest_env]
+RUST_BACKTRACE =  {value = "1", skip_if_set = true}
+
+[tool.ruff]
 # Exclude a variety of commonly ignored directories.
 exclude = [
     ".bzr",
@@ -26,7 +44,7 @@ exclude = [
 line-length = 120
 indent-width = 4
 
-[lint]
+[tool.ruff.lint]
 select = [
     # flake8-boolean-trap
     "FBT",
@@ -83,7 +101,7 @@ unfixable = []
 # Allow unused variables when underscore-prefixed.
 dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
 
-[format]
+[tool.ruff.format]
 # Like Black, use double quotes for strings.
 quote-style = "double"
 

scripts/run_component_tests.sh

@@ -12,13 +12,13 @@
 # SPDX-License-Identifier: Apache-2.0
 # *******************************************************************************
 
-# For the documentation, please refer to component_integration_tests/python_test_cases/run_tests.py
+# For the documentation, please refer to tests/test_cases/run_tests.py
 #
 # Example usage:
 #     Run all tests:
 #     ./run_component_tests.sh
 #
-#     Run all tests in a specific file (file path must be relative to python_test_cases folder):
+#     Run all tests in a specific file (file path must be relative to test_cases folder):
 #     ./run_component_tests.sh tests/runtime/worker/test_worker_basic.py
 #
 #     Run a specific scenario:
@@ -27,5 +27,5 @@
 FILE_PATH=$(realpath "$0")
 FILE_DIR=$(dirname "$FILE_PATH")
 
-cd "$FILE_DIR"/../component_integration_tests/python_test_cases || exit 1
+cd "$FILE_DIR"/../tests/test_cases || exit 1
 ./run_tests.py "$@"

src/xtask/src/main.rs

@@ -98,7 +98,7 @@ fn main() {
         "build:scenarios" => {
             run_build(
                 "debug_build",
-                &["build", "--manifest-path", "component_integration_tests/rust_test_scenarios/Cargo.toml"],
+                &["build", "--manifest-path", "tests/test_scenarios/rust/Cargo.toml"],
                 envs,
                 cli_env_vars,
                 &passthrough_args,
@@ -110,9 +110,9 @@ fn main() {
                 &[
                     "run",
                     "--manifest-path",
-                    "component_integration_tests/rust_test_scenarios/Cargo.toml",
+                    "tests/test_scenarios/rust/Cargo.toml",
                     "--bin",
-                    "rust_test_scenarios",
+                    "test_scenarios",
                 ],
                 envs,
                 cli_env_vars,

component_integration_tests/README.md → tests/README.md

@@ -9,23 +9,23 @@ Create `venv`, activate and install dependencies:
 ```bash
 python -m venv <REPO_ROOT>/.venv
 source <REPO_ROOT>/.venv/bin/activate
-pip install -r <REPO_ROOT>/component_integration_tests/python_test_cases/requirements.txt
+pip install -r <REPO_ROOT>/tests/test_cases/requirements.txt
 ```
 
 ## Usage
 
 Set current working directory to the following:
 
 ```bash
-cd <REPO_ROOT>/component_integration_tests/python_test_cases
+cd <REPO_ROOT>/tests/test_cases
 ```
 
 ### Run tests
 
 Bazel:
 
 ```bash
-bazel test //component_integration_tests/python_test_cases:cit
+bazel test //tests/test_cases:cit
 ```
 
 Basic run:
@@ -80,7 +80,7 @@ Test scenarios can be run independently from `pytest`.
 Set current working directory to the following:
 
 ```bash
-cd <REPO_ROOT>/component_integration_tests/rust_test_scenarios
+cd <REPO_ROOT>/tests/test_scenarios/rust
 ```
 
 List all available scenarios:
@@ -104,7 +104,7 @@ cargo run -- --name basic.only_shutdown --input '{"runtime": {"task_queue_size":
 Run test scenario executable directly:
 
 ```bash
-<REPO_ROOT>/target/debug/rust_test_scenarios --name basic.only_shutdown --input '{"runtime": {"task_queue_size": 256, "workers": 1}}'
+<REPO_ROOT>/target/debug/test_scenarios --name basic.only_shutdown --input '{"runtime": {"task_queue_size": 256, "workers": 1}}'
 ```
 
 ### Using Bazel
@@ -113,17 +113,17 @@ Bazel handles all setup steps like environment, rebuilding test scenarios by its
 All Component Integration Tests can be executed with:
 
 ```bash
-bazel test //component_integration_tests/python_test_cases:cit
+bazel test //tests/test_cases:cit
 ```
 
 Run all tests 5 times to check for sporadic errors:
 
 ```bash
-bazel test //component_integration_tests/python_test_cases:cit_repeat
+bazel test //tests/test_cases:cit_repeat
 ```
 
 Run Test Scenarios:
 
 ```bash
-bazel run //component_integration_tests/rust_test_scenarios:rust_test_scenarios -- --help
+bazel run //tests/test_scenarios/rust:test_scenarios -- --help
 ```

component_integration_tests/python_test_cases/BUILD → tests/test_cases/BUILD

@@ -15,10 +15,10 @@ load("@rules_python//python:pip.bzl", "compile_pip_requirements")
 load("@score_tooling//python_basics:defs.bzl", "score_py_pytest", "score_virtualenv")
 
 # In order to update the requirements, change the `requirements.in` file and run:
-# `bazel run //component_integration_tests/python_test_cases:requirements.update`.
+# `bazel run //tests/test_cases:requirements.update`.
 # This will update the `requirements.txt` file.
 # To upgrade all dependencies to their latest versions, run:
-# `bazel run //component_integration_tests/python_test_cases:requirements.update -- --upgrade`.
+# `bazel run //tests/test_cases:requirements.update -- --upgrade`.
 compile_pip_requirements(
     name = "requirements",
     srcs = [
@@ -43,11 +43,11 @@ score_py_pytest(
     srcs = glob(["tests/**/*.py"]),
     args = [
         "--traces=all",
-        "--target-path=$(rootpath //component_integration_tests/rust_test_scenarios)",
+        "--target-path=$(rootpath //tests/test_scenarios/rust:test_scenarios)",
     ],
     data = [
         ":python_tc_venv",
-        "//component_integration_tests/rust_test_scenarios",
+        "//tests/test_scenarios/rust:test_scenarios",
     ],
     env = {
         "RUST_BACKTRACE": "1",
@@ -66,11 +66,11 @@ score_py_pytest(
         "--traces=all",
         "--count=5",
         "--repeat-scope=session",
-        "--target-path=$(rootpath //component_integration_tests/rust_test_scenarios)",
+        "--target-path=$(rootpath //tests/test_scenarios/rust:test_scenarios)",
     ],
     data = [
         ":python_tc_venv",
-        "//component_integration_tests/rust_test_scenarios",
+        "//tests/test_scenarios/rust:test_scenarios",
     ],
     env = {
         "RUST_BACKTRACE": "1",

component_integration_tests/python_test_cases/pytest.ini → tests/test_cases/pytest.ini

@@ -12,8 +12,9 @@
 # *******************************************************************************
 [pytest]
 addopts = -v
-testpaths = tests
-pythonpath = ../..
+testpaths = tests/test_cases/tests
+pythonpath =
+    tests
 
 ; Additional environment variables
 env = D:RUST_BACKTRACE = 1
@@ -22,3 +23,7 @@ markers =
     root_required: root permissions are required for this test.
     do_not_repeat: do not repeat this test when using pytest-repeat.
     only_nightly: run this test only in nightly runs.
+
+filterwarnings =
+    ignore::pytest.PytestWarning
+    ignore::pytest.PytestExperimentalApiWarning