diff --git a/openpilot/starpilot/analytics/tests/test_settings.py b/openpilot/starpilot/analytics/tests/test_settings.py index cbe4fb4371..62e738c126 100644 --- a/openpilot/starpilot/analytics/tests/test_settings.py +++ b/openpilot/starpilot/analytics/tests/test_settings.py @@ -94,7 +94,7 @@ class TestActualSettingsOwners(unittest.TestCase): self.assertNotIn("setting_data_ShareUsageStats", large) self.assertNotIn("default_data_ShareUsageStats", large) self.assertTrue(large["setting_lane_LaneCentering"]) - self.assertFalse(large["default_lane_LaneCentering"]) + self.assertTrue(large["default_lane_LaneCentering"]) self.assertFalse(compact["setting_appearance_StockConfidenceBallWidget"]) self.assertTrue(compact["default_appearance_StockConfidenceBallWidget"]) self.assertEqual(large["default_display_ScreenTimeoutOnroad"], 10.0) diff --git a/openpilot/starpilot/galaxy/tests/test_settings.py b/openpilot/starpilot/galaxy/tests/test_settings.py index 42a2c6923f..a8d815da40 100644 --- a/openpilot/starpilot/galaxy/tests/test_settings.py +++ b/openpilot/starpilot/galaxy/tests/test_settings.py @@ -179,7 +179,8 @@ class SettingsGatewayTest(unittest.TestCase): self.assertNotEqual(first["view"], second["view"]) self.assertEqual(first["rows"], second["rows"]) first_row = first["rows"][0] - self.params.put_bool("LaneCentering", False, block=True) + self.assertEqual(first_row["value"], "On") + self.params.put_bool("LaneCentering", True, block=True) row = self.page("lane")["rows"][0] self.assertEqual(first_row["value"], row["value"]) self.assertNotEqual(first_row["revision"], row["revision"]) @@ -773,6 +774,7 @@ class SettingsGatewayTest(unittest.TestCase): self.assertEqual(legacy.read_bytes(), b'{"0.001":{"average":2.4,"count":2}}') def test_one_use_confirmation_and_exact_source_context(self): + self.params.put_bool("LaneCentering", False, block=True) page = self.page("lane") index = next(i for i, row in enumerate(page["rows"]) if row["label"] == "Enable Lane Centering") intent = self.gateway.preview(page["view"], index, 1, self.session, self.generation) @@ -1154,6 +1156,7 @@ class SettingsGatewayTest(unittest.TestCase): self.assertFalse(_onroad_preference("torque", "reset_profiles")) def test_live_lane_rejects_unsupported_vehicle_and_master_dependency(self): + self.params.put_bool("LaneCentering", False, block=True) tagged, _ = self._live_lane_context() page = self.page("lane") pause = next(row for row in page["rows"] if row["label"] == "Pause on signal") @@ -1917,6 +1920,7 @@ class SettingsHttpTest(unittest.TestCase): self.assertEqual(legacy.read_bytes(), b'{}') def test_auth_precedes_source_read_and_http_save(self): + self.params.put_bool("LaneCentering", False, block=True) calls = 0 original = self.gateway.page def counted(*args): @@ -1980,6 +1984,7 @@ class SettingsHttpTest(unittest.TestCase): self.assertFalse(self.params.get_bool("LaneCentering")) def test_confirm_finishes_before_acknowledged_logout(self): + self.params.put_bool("LaneCentering", False, block=True) cookie = self.login() _, page, _ = self.request("/api/settings/pages/lane", cookie=cookie) index = next(i for i, row in enumerate(page["rows"]) if row["label"] == "Enable Lane Centering") diff --git a/openpilot/starpilot/ui/tests/test_feature_settings_owner.py b/openpilot/starpilot/ui/tests/test_feature_settings_owner.py index 15e17c5e89..79f29882f9 100644 --- a/openpilot/starpilot/ui/tests/test_feature_settings_owner.py +++ b/openpilot/starpilot/ui/tests/test_feature_settings_owner.py @@ -382,7 +382,20 @@ class FeatureSettingsOwnerTests(unittest.TestCase): self.assertTrue(self.owner.apply(required_change(self._row("torque", "TurnAssist")))) self.assertTrue(VehicleStartupPreferences.read(self.params, enabled=True).turn_assist) + def test_lane_centering_default_and_saved_off_are_distinct(self): + self.assertIsNone(self.params.get("LaneCentering")) + row = self._row("lane", "LaneCentering") + self.assertEqual(row.value, "On") + self.assertEqual(row.default_value, "On") + self.assertIsNone(self.params.get("LaneCentering")) + self.params.put_bool("LaneCentering", False, block=True) + row = self._row("lane", "LaneCentering") + self.assertEqual(row.value, "Off") + self.assertEqual(row.default_value, "On") + self.assertFalse(self.params.get_bool("LaneCentering")) + def test_live_lane_owner_maps_only_explicit_keys(self): + self.params.put_bool("LaneCentering", False, block=True) from opendbc.car.car_helpers import interfaces from opendbc.car.toyota.values import CAR cp = interfaces[CAR.TOYOTA_COROLLA_TSS2].get_non_essential_params(CAR.TOYOTA_COROLLA_TSS2) diff --git a/openpilot/starpilot/ui/tests/test_global_feature_presentation.py b/openpilot/starpilot/ui/tests/test_global_feature_presentation.py index 1cedd25fc2..00ad1ca19f 100644 --- a/openpilot/starpilot/ui/tests/test_global_feature_presentation.py +++ b/openpilot/starpilot/ui/tests/test_global_feature_presentation.py @@ -140,6 +140,7 @@ class TestGlobalFeaturePresentation(unittest.TestCase): self.assertFalse(_qualified(AuthorityContext(False, cp, None), 'switchback_wheel')) def test_every_lane_control_matches_runtime_and_rechecks_before_writing(self): + self.params.put_bool("LaneCentering", False, block=True) cp = params_for(ToyotaCar.TOYOTA_RAV4_TSS2) owner = FeatureSettingsOwner(self.params, lambda _group: True, vehicle_fingerprint=lambda: cp.carFingerprint, vehicle_params=lambda: cp) diff --git a/openpilot/starpilot/ui/tests/test_onroad_favorites.py b/openpilot/starpilot/ui/tests/test_onroad_favorites.py index aee6d33f48..7f5c6c09e3 100644 --- a/openpilot/starpilot/ui/tests/test_onroad_favorites.py +++ b/openpilot/starpilot/ui/tests/test_onroad_favorites.py @@ -60,6 +60,7 @@ class TestOnroadFavorites(unittest.TestCase): with tempfile.TemporaryDirectory() as directory: params = Params(directory) + params.put_bool("LaneCentering", False, block=True) cp = CarInterface.get_non_essential_params(CAR.HONDA_CIVIC) session = runtime_app.StarShellSession.__new__(runtime_app.StarShellSession) session._mode, session.profile, session.selected = runtime_app.ShellMode.ONROAD, Profile.COMPACT, runtime_app.Destination.STAR diff --git a/openpilot/system/manager/test/test_manager.py b/openpilot/system/manager/test/test_manager.py index 0f9ee24fcf..f59eed236e 100755 --- a/openpilot/system/manager/test/test_manager.py +++ b/openpilot/system/manager/test/test_manager.py @@ -48,6 +48,9 @@ class TestManager(OpenpilotTestCase): if k == b"LKASButtonControl": assert params.get(k) is None assert params.get(k, return_default=True) == 0 + elif k == b"LaneCentering": + assert default_value is False + assert params.get(k) is True elif default_value is not None: assert params.get(k) == default_value assert params.get("AlwaysOnLateral") is True diff --git a/prebuilt.json b/prebuilt.json index ad9ae7e1b5..362036b5de 100644 --- a/prebuilt.json +++ b/prebuilt.json @@ -1 +1 @@ -{"protected_inventory_sha256": "2b91b90d7993a9b083ca82e08f9aa7e91e04dd4eb1b8fa8b6c77d4717916dd14", "schema_version": 1} +{"protected_inventory_sha256": "342afaf60ffcf7ce4a22e944e4aa384bfb13c5c08688db613d9a6795bab44822", "schema_version": 1}