Merge pull request eclipse-score#244 from qorix-group/arkjedrz_cit-fix-config

testing: fix config in CIT

Author: vinodreddy-g

tests/test_cases/requirements.txt

@@ -1,4 +1,4 @@
 psutil
 pytest-metadata
 pytest-env
-testing-utils @ git+https://github.com/eclipse-score/testing_tools.git@479f0fdc8e28688df0fb8db80de25592c8386a93
+testing-utils @ git+https://github.com/eclipse-score/testing_tools.git@007c9027d69ee5408add68fd598179129166ceb9

tests/test_cases/requirements.txt.lock

@@ -4,15 +4,15 @@
 #
 #    bazel run //tests/test_cases:requirements.update
 #
-basedpyright==1.29.2 \
-    --hash=sha256:12c49186003b9f69a028615da883ef97035ea2119a9e3f93a00091b3a27088a6 \
-    --hash=sha256:f389e2997de33d038c5065fd85bff351fbdc62fa6d6371c7b947fc3bce8d437d
-    # via -r /home/igor/.cache/bazel/_bazel_igor/a5a65d3bba19ab266bf2b3ef63ca3606/external/score_tooling+/python_basics/requirements.txt
-iniconfig==2.1.0 \
-    --hash=sha256:3abbd2e30b36733fee78f9c7f7308f2d0050e88f0087fd25c2645f63c773e1c7 \
-    --hash=sha256:9deba5723312380e77435581c6bf4935c94cbfab9b1ed33ef8d238ea168eb760
+basedpyright==1.35.0 \
+    --hash=sha256:2a7e0bd476623d48499e2b18ff6ed19dc28c51909cf9e1152ad355b5809049ad \
+    --hash=sha256:4f4f84023df5a0cd4ee154916ba698596682ac98bacfa22c941ed6aaf07bba4e
+    # via -r /home/arkjedrz/.cache/bazel/_bazel_arkjedrz/adbb5e0ca4374ec9e368894d6ca49e09/external/score_tooling+/python_basics/requirements.txt
+iniconfig==2.3.0 \
+    --hash=sha256:c76315c77db068650d49c5b56314774a7804df16fee4402c1f19d6d15d8c4730 \
+    --hash=sha256:f631c04d2c48c52b84d0d0549c99ff3859c98df65b3101406327ecc7d53fbf12
     # via
-    #   -r /home/igor/.cache/bazel/_bazel_igor/a5a65d3bba19ab266bf2b3ef63ca3606/external/score_tooling+/python_basics/requirements.txt
+    #   -r /home/arkjedrz/.cache/bazel/_bazel_arkjedrz/adbb5e0ca4374ec9e368894d6ca49e09/external/score_tooling+/python_basics/requirements.txt
     #   pytest
 jinja2==3.1.6 \
     --hash=sha256:0137fb05990d35f1275a587e9aee6d56da821fc83491a0fb838183be43f66d6d \
@@ -81,30 +81,30 @@ markupsafe==3.0.2 \
     --hash=sha256:f8b3d067f2e40fe93e1ccdd6b2e1d16c43140e76f02fb1319a05cf2b79d99430 \
     --hash=sha256:fcabf5ff6eea076f859677f5f0b6b5c1a51e70a376b0579e0eadef8db48c6b50
     # via jinja2
-nodejs-wheel-binaries==22.16.0 \
-    --hash=sha256:2728972d336d436d39ee45988978d8b5d963509e06f063e80fe41b203ee80b28 \
-    --hash=sha256:2fffb4bf1066fb5f660da20819d754f1b424bca1b234ba0f4fa901c52e3975fb \
-    --hash=sha256:447ad796850eb52ca20356ad39b2d296ed8fef3f214921f84a1ccdad49f2eba1 \
-    --hash=sha256:4ae3cf22138891cb44c3ee952862a257ce082b098b29024d7175684a9a77b0c0 \
-    --hash=sha256:71f2de4dc0b64ae43e146897ce811f80ac4f9acfbae6ccf814226282bf4ef174 \
-    --hash=sha256:7f526ca6a132b0caf633566a2a78c6985fe92857e7bfdb37380f76205a10b808 \
-    --hash=sha256:986b715a96ed703f8ce0c15712f76fc42895cf09067d72b6ef29e8b334eccf64 \
-    --hash=sha256:d695832f026df3a0cf9a089d222225939de9d1b67f8f0a353b79f015aabbe7e2 \
-    --hash=sha256:dbfccbcd558d2f142ccf66d8c3a098022bf4436db9525b5b8d32169ce185d99e
+nodejs-wheel-binaries==24.11.1 \
+    --hash=sha256:0e14874c3579def458245cdbc3239e37610702b0aa0975c1dc55e2cb80e42102 \
+    --hash=sha256:10197b1c9c04d79403501766f76508b0dac101ab34371ef8a46fcf51773497d0 \
+    --hash=sha256:376b9ea1c4bc1207878975dfeb604f7aa5668c260c6154dcd2af9d42f7734116 \
+    --hash=sha256:413dfffeadfb91edb4d8256545dea797c237bba9b3faefea973cde92d96bb922 \
+    --hash=sha256:5ef598101b0fb1c2bf643abb76dfbf6f76f1686198ed17ae46009049ee83c546 \
+    --hash=sha256:78bc5bb889313b565df8969bb7423849a9c7fc218bf735ff0ce176b56b3e96f0 \
+    --hash=sha256:c2741525c9874b69b3e5a6d6c9179a6fe484ea0c3d5e7b7c01121c8e5d78b7e2 \
+    --hash=sha256:c79a7e43869ccecab1cae8183778249cceb14ca2de67b5650b223385682c6239 \
+    --hash=sha256:cde41d5e4705266688a8d8071debf4f8a6fcea264c61292782672ee75a6905f9
     # via
-    #   -r /home/igor/.cache/bazel/_bazel_igor/a5a65d3bba19ab266bf2b3ef63ca3606/external/score_tooling+/python_basics/requirements.txt
+    #   -r /home/arkjedrz/.cache/bazel/_bazel_arkjedrz/adbb5e0ca4374ec9e368894d6ca49e09/external/score_tooling+/python_basics/requirements.txt
     #   basedpyright
 packaging==25.0 \
     --hash=sha256:29572ef2b1f17581046b3a2227d5c611fb25ec70ca1ba8554b24b0e69331a484 \
     --hash=sha256:d443872c98d677bf60f6a1f2f8c1cb748e8fe762d2bf9d3148b5599295b0fc4f
     # via
-    #   -r /home/igor/.cache/bazel/_bazel_igor/a5a65d3bba19ab266bf2b3ef63ca3606/external/score_tooling+/python_basics/requirements.txt
+    #   -r /home/arkjedrz/.cache/bazel/_bazel_arkjedrz/adbb5e0ca4374ec9e368894d6ca49e09/external/score_tooling+/python_basics/requirements.txt
     #   pytest
 pluggy==1.6.0 \
     --hash=sha256:7dcc130b76258d33b90f61b658791dede3486c3e6bfb003ee5c9bfb396dd22f3 \
     --hash=sha256:e920276dd6813095e9377c0bc5566d94c932c33b27a3e3945d8389c374dd4746
     # via
-    #   -r /home/igor/.cache/bazel/_bazel_igor/a5a65d3bba19ab266bf2b3ef63ca3606/external/score_tooling+/python_basics/requirements.txt
+    #   -r /home/arkjedrz/.cache/bazel/_bazel_arkjedrz/adbb5e0ca4374ec9e368894d6ca49e09/external/score_tooling+/python_basics/requirements.txt
     #   pytest
 psutil==7.1.3 \
     --hash=sha256:0005da714eee687b4b8decd3d6cc7c6db36215c9e74e5ad2264b90c3df7d92dc \
@@ -127,11 +127,17 @@ psutil==7.1.3 \
     --hash=sha256:f39c2c19fe824b47484b96f9692932248a54c43799a84282cfe58d05a6449efd \
     --hash=sha256:fac9cd332c67f4422504297889da5ab7e05fd11e3c4392140f7370f4208ded1f
     # via -r tests/test_cases/requirements.txt
-pytest==8.3.5 \
-    --hash=sha256:c69214aa47deac29fad6c2a4f590b9c4a9fdb16a403176fe154b79c0b4d4d820 \
-    --hash=sha256:f4efe70cc14e511565ac476b57c279e12a855b11f48f212af1080ef2263d3845
+pygments==2.19.2 \
+    --hash=sha256:636cb2477cec7f8952536970bc533bc43743542f70392ae026374600add5b887 \
+    --hash=sha256:86540386c03d588bb81d44bc3928634ff26449851e99741617ecb9037ee5ec0b
     # via
-    #   -r /home/igor/.cache/bazel/_bazel_igor/a5a65d3bba19ab266bf2b3ef63ca3606/external/score_tooling+/python_basics/requirements.txt
+    #   -r /home/arkjedrz/.cache/bazel/_bazel_arkjedrz/adbb5e0ca4374ec9e368894d6ca49e09/external/score_tooling+/python_basics/requirements.txt
+    #   pytest
+pytest==9.0.1 \
+    --hash=sha256:3e9c069ea73583e255c3b21cf46b8d3c56f6e3a1a8f6da94ccb0fcf57b9d73c8 \
+    --hash=sha256:67be0030d194df2dfa7b556f2e56fb3c3315bd5c8822c6951162b92b32ce7dad
+    # via
+    #   -r /home/arkjedrz/.cache/bazel/_bazel_arkjedrz/adbb5e0ca4374ec9e368894d6ca49e09/external/score_tooling+/python_basics/requirements.txt
     #   pytest-env
     #   pytest-html
     #   pytest-metadata
@@ -157,5 +163,5 @@ pytest-repeat==0.9.4 \
     # via testing-utils
 # WARNING: pip install will require the following package to be hashed.
 # Consider using a hashable URL like https://github.com/jazzband/pip-tools/archive/SOMECOMMIT.zip
-testing-utils @ git+https://github.com/eclipse-score/testing_tools.git@479f0fdc8e28688df0fb8db80de25592c8386a93
+testing-utils @ git+https://github.com/eclipse-score/testing_tools.git@007c9027d69ee5408add68fd598179129166ceb9
     # via -r tests/test_cases/requirements.txt

tests/test_cases/tests/common.py

@@ -65,7 +65,7 @@ class CommonScenario(Scenario):
     @pytest.fixture(scope="class")
     def build_tools(self, version: str) -> BuildTools:
         assert version in ("cpp", "rust")
-        return BazelTools(option_prefix=version)
+        return BazelTools(option_prefix=version, config="per-x86_64-linux")
 
     @pytest.fixture(scope="class")
     def temp_dir(self, tmp_path_factory: pytest.TempPathFactory, version: str) -> Generator[Path, None, None]:

tests/test_cases/tests/conftest.py

@@ -84,15 +84,15 @@ def pytest_sessionstart(session):
 
             # Build Rust test scenarios.
             logger.info("Building Rust test scenarios executable...")
-            cargo_tools = BazelTools(option_prefix="rust", build_timeout=build_timeout)
+            rust_build_tools = BazelTools(option_prefix="rust", build_timeout=build_timeout, config="per-x86_64-linux")
             rust_target_name = session.config.getoption("--rust-target-name")
-            cargo_tools.build(rust_target_name)
+            rust_build_tools.build(rust_target_name)
 
             # Build C++ test scenarios.
             logger.info("Building C++ test scenarios executable...")
-            bazel_tools = BazelTools(option_prefix="cpp", build_timeout=build_timeout)
+            cpp_build_tools = BazelTools(option_prefix="cpp", build_timeout=build_timeout, config="per-x86_64-linux")
             cpp_target_name = session.config.getoption("--cpp-target-name")
-            bazel_tools.build(cpp_target_name, "--config=per-x86_64-linux")
+            cpp_build_tools.build(cpp_target_name)
 
     except Exception as e:
         pytest.exit(str(e), returncode=1)