diff --git a/prebuilt.json b/prebuilt.json index a0fa41d05a..c723e030dd 100644 --- a/prebuilt.json +++ b/prebuilt.json @@ -1 +1 @@ -{"protected_inventory_sha256": "66e62824cc864d2942c8eb3ddbd302f84ba0223df8513290f3ef2c4244a4ac1d", "schema_version": 1} +{"protected_inventory_sha256": "b5b0da30a3250def52f7179f7f80bf039e53c212c07a11e0e258a4044f348ed4", "schema_version": 1} diff --git a/tools/ci/run_vehicle_tests.py b/tools/ci/run_vehicle_tests.py index ad6a39bb0a..486b5eae61 100644 --- a/tools/ci/run_vehicle_tests.py +++ b/tools/ci/run_vehicle_tests.py @@ -24,8 +24,7 @@ from tools.ci import lifecycle_shards, vehicle_pytest # Representative production callers plus their source/native refusal cases. # The emitted selected_test_ids record exact parametrized configurations. AOL_LIFECYCLE_TARGETS = ( - 'openpilot/starpilot/aol/tests/test_hkg_cancel_joined.py::test_gv70_single_panda_long_cancel_neighbor', - 'openpilot/starpilot/aol/tests/test_hkg_cancel_joined.py::test_gv70_two_panda_long_actual_join', + 'openpilot/starpilot/aol/tests/test_hkg_cancel_joined.py', 'openpilot/starpilot/aol/tests/test_gv70_two_panda_long.py', 'openpilot/starpilot/longitudinal/tests/test_gv70_stopping_parity.py', diff --git a/tools/ci/tests/test_vehicle_ci.py b/tools/ci/tests/test_vehicle_ci.py index 7b7c707568..d809ebdf22 100644 --- a/tools/ci/tests/test_vehicle_ci.py +++ b/tools/ci/tests/test_vehicle_ci.py @@ -19,12 +19,15 @@ class TestVehicleCollection(unittest.TestCase): def test_gv70_two_panda_and_stop_parity_callers_are_required(self): required = ( - 'openpilot/starpilot/aol/tests/test_hkg_cancel_joined.py::test_gv70_two_panda_long_actual_join', + 'openpilot/starpilot/aol/tests/test_hkg_cancel_joined.py', 'openpilot/starpilot/aol/tests/test_gv70_two_panda_long.py', 'openpilot/starpilot/longitudinal/tests/test_gv70_stopping_parity.py', - 'openpilot/starpilot/aol/tests/test_hkg_cancel_joined.py::test_gv70_single_panda_long_cancel_neighbor', ) - self.assertLessEqual(set(required), set(targets_for('aol-lifecycle'))) + targets = targets_for('aol-lifecycle') + self.assertLessEqual(set(required), set(targets)) + for target in targets: + self.assertTrue(target.endswith('.py'), target) + self.assertNotIn('::', target) def test_hkg_gv60_and_inherited_profile_guards_are_required(self):