mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-22 06:15:58 +00:00
fix(steam): drain queued control notifications
This commit is contained in:
1 parent
749ade4a45
commit
4d7ceb2325
2 files changed
+39
-1
No files matched your search
@@ -959,7 +959,8 @@ class Helper:
|
|||||||
sources = [self.page.ws] + ([watcher] if watcher.fileno() >= 0 else [])
|
sources = [self.page.ws] + ([watcher] if watcher.fileno() >= 0 else [])
|
||||||
if self.chooser is not None:
|
if self.chooser is not None:
|
||||||
sources.append(self.chooser[1].stdout)
|
sources.append(self.chooser[1].stdout)
|
||||||
ready = [self.page.ws] if self.page.ws.pending() else select.select(sources, [], [], 0.25)[0]
|
queued = self.page.ws.pending() or bool(self.page.events)
|
||||||
|
ready = [self.page.ws] if queued else select.select(sources, [], [], 0.25)[0]
|
||||||
if self.chooser is not None and self.chooser[1].stdout in ready:
|
if self.chooser is not None and self.chooser[1].stdout in ready:
|
||||||
self.chooser_done()
|
self.chooser_done()
|
||||||
due = False
|
due = False
|
||||||
|
|||||||
@@ -4,12 +4,49 @@ import runpy
|
|||||||
import subprocess
|
import subprocess
|
||||||
import tempfile
|
import tempfile
|
||||||
import unittest
|
import unittest
|
||||||
|
from unittest import mock
|
||||||
|
|
||||||
BIN = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin"
|
BIN = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin"
|
||||||
LIVE = runpy.run_path(str(BIN / "droiddeck-steam-compat"))
|
LIVE = runpy.run_path(str(BIN / "droiddeck-steam-compat"))
|
||||||
|
|
||||||
|
|
||||||
class DeviceControlsTest(unittest.TestCase):
|
class DeviceControlsTest(unittest.TestCase):
|
||||||
|
def test_sync_controls_queued_notifications_are_processed_without_another_frame(self):
|
||||||
|
with tempfile.TemporaryDirectory() as directory:
|
||||||
|
Path(directory, "state.json").write_text(json.dumps({"brightness": 0.5, "revision": 1}))
|
||||||
|
helper = LIVE["Helper"]("/steam", 0)
|
||||||
|
helper.controls_installed = True
|
||||||
|
page = mock.Mock(events=[])
|
||||||
|
page.ws.pending.return_value = False
|
||||||
|
helper.page = page
|
||||||
|
payload = json.dumps({"id": 1, "options": {"strTitle": "Pick a file"}})
|
||||||
|
def evaluate(expression):
|
||||||
|
for name, value in [(LIVE["BRIGHTNESS_BINDING"], "0.4"), (LIVE["FILE_BINDING"], payload)]:
|
||||||
|
page.events.append({"method": "Runtime.bindingCalled", "params": {"name": name, "payload": value}})
|
||||||
|
return True
|
||||||
|
def drain():
|
||||||
|
events, page.events = page.events, []
|
||||||
|
return events
|
||||||
|
page.evaluate.side_effect = evaluate
|
||||||
|
page.drain.side_effect = drain
|
||||||
|
helper.reconcile = mock.Mock()
|
||||||
|
helper.ensure_tools = mock.Mock(side_effect=[None, StopIteration])
|
||||||
|
helper.open_chooser = mock.Mock()
|
||||||
|
watcher = mock.Mock()
|
||||||
|
watcher.fileno.return_value = -1
|
||||||
|
watcher.changed.return_value = False
|
||||||
|
globals_ = LIVE["Helper"].serve.__globals__
|
||||||
|
with mock.patch.dict(globals_, {"CONTROLS_DIR": directory,
|
||||||
|
"brightness_request": lambda value: LIVE["brightness_request"](value, directory)}), \
|
||||||
|
mock.patch.dict(globals_["COMPAT"], {"state_path": lambda name: str(Path(directory, name))}), \
|
||||||
|
mock.patch.object(globals_["select"], "select", return_value=([], [], [])) as select_:
|
||||||
|
with self.assertRaises(StopIteration):
|
||||||
|
helper.serve(watcher)
|
||||||
|
self.assertEqual(float(Path(directory, "brightness.request").read_text()), 0.4)
|
||||||
|
helper.open_chooser.assert_called_once_with(payload)
|
||||||
|
self.assertEqual(page.events, [])
|
||||||
|
select_.assert_not_called()
|
||||||
|
|
||||||
def test_native_brightness_notifications_do_not_echo_android_readback(self):
|
def test_native_brightness_notifications_do_not_echo_android_readback(self):
|
||||||
harness = r"""
|
harness = r"""
|
||||||
const assert = require('assert');
|
const assert = require('assert');
|
||||||
|
|||||||
Reference in new issue
Block a user