scorebug issue resolved

Author: Saumya-R

feature_integration_tests/README.md

@@ -48,19 +48,13 @@ bazel run //feature_integration_tests/test_scenarios/rust:rust_test_scenarios --
 bazel test --config=linux-x86_64 //feature_integration_tests/test_cases:fit --test_output=streamed
 ```
 
-The Rust side of this lifecycle-only suite uses a dedicated Bazel target,
-`//feature_integration_tests/test_scenarios/rust:rust_lifecycle_test_scenarios`,
-which still reuses `test_scenarios/rust/src/main.rs`. It is built with the
-`lifecycle_only` cfg so only lifecycle scenarios are compiled for that suite,
-while the normal `fit` and `fit_rust` targets continue to use the full scenario tree.
-
 To run the lifecycle tests directly with `pytest` and build the scenario binaries on demand:
 
 ```sh
 python3 -m pytest feature_integration_tests/test_cases/tests/lifecycle/ \
   --build-scenarios \
   -m rust \
-  --rust-target-name=//feature_integration_tests/test_scenarios/rust:rust_lifecycle_test_scenarios \
+  --rust-target-name=//feature_integration_tests/test_scenarios/rust:rust_test_scenarios \
   -q -v
 
 python3 -m pytest feature_integration_tests/test_cases/tests/lifecycle/ \

feature_integration_tests/test_cases/BUILD

@@ -88,14 +88,14 @@ score_py_pytest(
     args = [
         "-m rust",
         "--traces=all",
-        "--rust-target-path=$(rootpath //feature_integration_tests/test_scenarios/rust:rust_lifecycle_test_scenarios)",
+        "--rust-target-path=$(rootpath //feature_integration_tests/test_scenarios/rust:rust_test_scenarios)",
     ],
     data = [
         "conftest.py",
         "fit_scenario.py",
         "lifecycle_scenario.py",
         "test_properties.py",
-        "//feature_integration_tests/test_scenarios/rust:rust_lifecycle_test_scenarios",
+        "//feature_integration_tests/test_scenarios/rust:rust_test_scenarios",
     ],
     env = {
         "RUST_BACKTRACE": "1",

feature_integration_tests/test_scenarios/rust/BUILD

@@ -32,29 +32,3 @@ rust_binary(
         "@score_test_scenarios//test_scenarios_rust",
     ],
 )
-
-rust_binary(
-    name = "rust_lifecycle_test_scenarios",
-    srcs = [
-        "src/main.rs",
-        "src/scenarios/lifecycle/conditional_launching.rs",
-        "src/scenarios/lifecycle/mod.rs",
-    ],
-    crate_root = "src/main.rs",
-    # Build the lifecycle-only Rust FIT from the same main.rs entrypoint.
-    # This target is a temporary workaround for the unresolved ScoreDebug
-    # dependency in score_persistency/rust_kvs.
-    # Tracking issue: https://github.com/eclipse-score/persistency/issues/375
-    # Remove this target when the issue is fixed upstream.
-    rustc_flags = ["--cfg=lifecycle_only"],
-    tags = [
-        "manual",
-    ],
-    visibility = ["//visibility:public"],
-    deps = [
-        "@score_crates//:serde_json",
-        "@score_crates//:tracing",
-        "@score_crates//:tracing_subscriber",
-        "@score_test_scenarios//test_scenarios_rust",
-    ],
-)

feature_integration_tests/test_scenarios/rust/src/main.rs

@@ -11,30 +11,12 @@
 // SPDX-License-Identifier: Apache-2.0
 // *******************************************************************************
 
-// The normal FIT binary builds the full scenario tree, which includes persistency
-// scenarios and their transitive dependencies.
-#[cfg(not(lifecycle_only))]
 mod internals;
-#[cfg(not(lifecycle_only))]
 mod scenarios;
-// The lifecycle-only build reuses this same entrypoint but limits compilation to
-// lifecycle scenarios. This is needed because the conditional-launching FIT only
-// exercises lifecycle behavior, while the full Rust FIT binary currently pulls in
-// score_persistency/rust_kvs where ScoreDebug-related path logging compilation
-// issues are still unresolved upstream.
-#[cfg(lifecycle_only)]
-#[path = "scenarios/lifecycle/mod.rs"]
-mod lifecycle;
 
 use test_scenarios_rust::cli::run_cli_app;
 use test_scenarios_rust::test_context::TestContext;
 
-#[cfg(lifecycle_only)]
-use crate::lifecycle::lifecycle_group;
-#[cfg(lifecycle_only)]
-use test_scenarios_rust::scenario::{ScenarioGroup, ScenarioGroupImpl};
-// The default build keeps the existing root scenario registration for the full FIT suite.
-#[cfg(not(lifecycle_only))]
 use crate::scenarios::root_scenario_group;
 use std::time::{SystemTime, UNIX_EPOCH};
 use tracing::Level;
@@ -61,15 +43,6 @@ fn init_tracing_subscriber() {
     tracing::subscriber::set_global_default(subscriber).expect("Setting default subscriber failed!");
 }
 
-// In lifecycle-only mode we construct a reduced root group from the same main.rs
-// entrypoint instead of introducing a second Rust binary entry source. This keeps
-// the folder layout and normal FIT execution unchanged while providing a stable
-// workaround until the ScoreDebug issue is fixed in score_persistency.
-#[cfg(lifecycle_only)]
-fn root_scenario_group() -> Box<dyn ScenarioGroup> {
-    Box::new(ScenarioGroupImpl::new("root", vec![], vec![lifecycle_group()]))
-}
-
 fn main() -> Result<(), String> {
     let raw_arguments: Vec<String> = std::env::args().collect();