diff --git a/.gitattributes b/.gitattributes index 211a32d9e8..572c56264e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -16,6 +16,8 @@ openpilot/starpilot/galaxy/web/vendor/vue/vue.esm-browser.js -text openpilot/starpilot/galaxy/bin/hev-socks5-tunnel_linux_arm64 -text openpilot/starpilot/soloist/pulseaudio/bin/pulseaudio -text openpilot/starpilot/soloist/pulseaudio/bin/pactl -text +openpilot/starpilot/soloist/bluealsa/bin/bluealsa-aplay -text +openpilot/starpilot/soloist/bluealsa/bin/bluealsad -text openpilot/selfdrive/car/tests/test_models_segs.txt -text openpilot/common/hardware/comma/updater -text diff --git a/openpilot/starpilot/soloist/tests/test_phone_audio.py b/openpilot/starpilot/soloist/tests/test_phone_audio.py index 89ecb36844..e045779a87 100644 --- a/openpilot/starpilot/soloist/tests/test_phone_audio.py +++ b/openpilot/starpilot/soloist/tests/test_phone_audio.py @@ -260,7 +260,7 @@ def test_car_controls_flush_queued_phone_audio_only_for_pause_and_skip(music, mo assert sup.handle({'command': 'control', 'action': action, 'args': {}})['ok'] assert sent == [(player.pid, signal.SIGUSR1), (player.pid, signal.SIGUSR2), (player.pid, signal.SIGUSR2), (player.pid, signal.SIGUSR1)] - player.code = 1 # a dead worker is never signalled + player.code = 1 # a dead worker is never signaled sent.clear() assert sup.handle({'command': 'control', 'action': 'pause', 'args': {}})['ok'] assert sent == [] @@ -291,7 +291,7 @@ def test_relay_flushes_and_mutes_phone_audio_after_a_flush_request(tmp_path, mon if data and data[0] == 3: phone_audio.request_flush('skip') # the car pressed next while chunk 3 was in flight return data - Capture.stdout = type('S', (), {'read': staticmethod(read)}) + monkeypatch.setattr(Capture.stdout, 'read', read) monkeypatch.setattr(phone_audio, 'PulseWriter', Writer) monkeypatch.setattr(phone_audio.subprocess, 'Popen', lambda *a, **k: Capture()) monkeypatch.setattr(phone_audio.time, 'monotonic', lambda: clock[0]) diff --git a/prebuilt.json b/prebuilt.json index 1798c14cb9..b000efe0f2 100644 --- a/prebuilt.json +++ b/prebuilt.json @@ -1 +1 @@ -{"protected_inventory_sha256": "9a0184a063f68cb782667240119b99c1eb0b4786d285659a05f7d6b776136d32", "schema_version": 1} +{"protected_inventory_sha256": "9ac218d1b06065b7f3c3d769ab507101e89aeedd5d90b68de21f463b476096f3", "schema_version": 1}