mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-19 21:06:09 +00:00
fix: Steam no longer sleeps again right after a paused session resumes (#1162)
This commit is contained in:
1 parent
421ffc7506
commit
fd74819c50
5 files changed
+261
-19
No files matched your search
@@ -338,6 +338,33 @@ class AgentTest(unittest.TestCase):
|
||||
with patch.object(agent, "cdp_eval", side_effect=agent.AgentError("NO_DEVTOOLS", "down")):
|
||||
self.assertEqual(1, agent.main(["--steam-asleep"]))
|
||||
|
||||
def test_idle_inhibit_command_reports_whether_steam_reached_the_state(self):
|
||||
with patch.dict(os.environ, {"BL_LAUNCH_DIR": str(self.dir.parent)}):
|
||||
for value, code in ((True, 0), (False, 1), (None, 1)):
|
||||
with self.subTest(value=value), patch.object(agent, "cdp_eval", return_value={"value": value}) as ask:
|
||||
self.assertEqual(code, agent.main(["--steam-idle-inhibit", "on"]))
|
||||
self.assertIn("toggle_idle_suspend_inhibit 1", ask.call_args.args[1])
|
||||
self.assertTrue(ask.call_args.args[1].rstrip().endswith("(true)"))
|
||||
with patch.object(agent, "cdp_eval", return_value={"value": True}) as ask:
|
||||
self.assertEqual(0, agent.main(["--steam-idle-inhibit", "off"]))
|
||||
self.assertTrue(ask.call_args.args[1].rstrip().endswith("(false)"))
|
||||
with patch.object(agent, "cdp_eval", side_effect=agent.AgentError("NO_DEVTOOLS", "down")):
|
||||
self.assertEqual(1, agent.main(["--steam-idle-inhibit", "on"]))
|
||||
self.assertEqual(2, agent.main(["--steam-idle-inhibit", "maybe"]))
|
||||
|
||||
def test_idle_suspend_seconds_follow_the_power_source(self):
|
||||
vpower = self.dir / "ac_status"
|
||||
with patch.object(agent, "cdp_eval", return_value={"value": [3600, 900]}):
|
||||
vpower.write_text("Connected\n")
|
||||
self.assertEqual(3600, agent.steam_idle_suspend_seconds(self.dir, vpower))
|
||||
vpower.write_text("Disconnected\n")
|
||||
self.assertEqual(900, agent.steam_idle_suspend_seconds(self.dir, vpower))
|
||||
with patch.object(agent, "cdp_eval", return_value={"value": None}):
|
||||
self.assertIsNone(agent.steam_idle_suspend_seconds(self.dir, vpower))
|
||||
with patch.dict(os.environ, {"BL_LAUNCH_DIR": str(self.dir.parent)}), \
|
||||
patch.object(agent, "steam_idle_suspend_seconds", return_value=None):
|
||||
self.assertEqual(1, agent.main(["--steam-idle-suspend-seconds"]))
|
||||
|
||||
def test_cdp_exception(self):
|
||||
server = FakeDevTools({"result": {"result": {"type": "object"}, "exceptionDetails": {
|
||||
"text": "Uncaught", "exception": {"description": "ReferenceError: SteamClient is not defined"}}}})
|
||||
|
||||
@@ -77,6 +77,7 @@ class SleepHandshakeTest(unittest.TestCase):
|
||||
GLib.Variant("(ss)", (IFACE, "PreparingForSleep")))[0]
|
||||
|
||||
def suspend(self):
|
||||
(self.dir / "steam-sleep").unlink(missing_ok=True)
|
||||
self.call(IFACE, "Suspend", GLib.Variant("(b)", (True,)))
|
||||
self.wait_for(lambda: (self.dir / "steam-sleep").exists())
|
||||
self.wait_for(lambda: self.signals == [True])
|
||||
@@ -239,6 +240,7 @@ class FakeAgentCase(unittest.TestCase):
|
||||
suspend = SleepHandshakeTest.suspend
|
||||
state = SleepHandshakeTest.state
|
||||
request_wake = SleepHandshakeTest.request_wake
|
||||
request_native = SleepHandshakeTest.request_native
|
||||
|
||||
def asked(self):
|
||||
path = self.dir / "agent-calls"
|
||||
@@ -264,7 +266,7 @@ class AwakeSteamTest(FakeAgentCase):
|
||||
self.state(token, "paused")
|
||||
self.request_wake()
|
||||
self.wait_for(lambda: self.signals == [True, False])
|
||||
self.assertEqual([], self.asked())
|
||||
self.assertNotIn("--steam-asleep", self.asked())
|
||||
|
||||
|
||||
@unittest.skipUnless(Gio and os.environ.get("DBUS_SESSION_BUS_ADDRESS"), "requires dbus-run-session and PyGObject")
|
||||
@@ -276,6 +278,53 @@ class AsleepSteamTest(FakeAgentCase):
|
||||
self.wait_for(lambda: self.signals == [True, False])
|
||||
self.assertEqual(["--steam-asleep"], self.asked())
|
||||
|
||||
def test_steam_sleep_request_holds_idle_sleep_before_the_host_pauses(self):
|
||||
token = self.suspend()
|
||||
self.assertEqual(["--steam-idle-inhibit", "on"], self.asked())
|
||||
self.state(token, "paused")
|
||||
self.state(token, "awake")
|
||||
self.wait_for(lambda: self.signals == [True, False])
|
||||
self.wait_for(lambda: self.asked()[-1:] == ["off"])
|
||||
self.assertEqual(["--steam-idle-inhibit", "on", "--steam-idle-suspend-seconds",
|
||||
"--steam-idle-inhibit", "off"], self.asked())
|
||||
|
||||
def test_idle_pause_holds_idle_sleep_without_a_sleep_wake_pair(self):
|
||||
token = self.request_native("2" * 32 + " idle").split()[0]
|
||||
self.wait_for(lambda: (self.dir / "steam-native-ready").exists())
|
||||
self.assertEqual(token, (self.dir / "steam-native-ready").read_text().strip())
|
||||
self.assertEqual(["--steam-idle-inhibit", "on"], self.asked())
|
||||
self.state(token, "paused")
|
||||
self.state(token, "awake")
|
||||
self.wait_for(lambda: self.asked()[-1:] == ["off"])
|
||||
self.assertEqual([], self.signals)
|
||||
self.assertEqual(["--steam-idle-inhibit", "on", "--steam-idle-suspend-seconds",
|
||||
"--steam-idle-inhibit", "off"], self.asked())
|
||||
|
||||
def test_a_failed_release_is_tried_again(self):
|
||||
failed = self.dir / "release-failed"
|
||||
(self.dir / "bin/droiddeck-agent").write_text(
|
||||
"#!/bin/sh\necho \"$@\" >> \"%s\"\n"
|
||||
"if [ \"$2\" = off ] && [ ! -e \"%s\" ]; then : > \"%s\"; exit 1; fi\nexit 0\n"
|
||||
% (self.dir / "agent-calls", failed, failed))
|
||||
token = self.suspend()
|
||||
self.state(token, "paused")
|
||||
self.state(token, "awake")
|
||||
self.wait_for(lambda: self.asked().count("off") == 2)
|
||||
time.sleep(2.5)
|
||||
self.assertEqual(["--steam-idle-inhibit", "on", "--steam-idle-suspend-seconds",
|
||||
"--steam-idle-inhibit", "off", "--steam-idle-inhibit", "off"], self.asked())
|
||||
|
||||
def test_a_hold_steam_did_not_confirm_is_still_released(self):
|
||||
(self.dir / "bin/droiddeck-agent").write_text(
|
||||
"#!/bin/sh\necho \"$@\" >> \"%s\"\n[ \"$2\" = on ] && exit 1\nexit 0\n" % (self.dir / "agent-calls"))
|
||||
token = self.suspend()
|
||||
self.state(token, "paused")
|
||||
self.state(token, "awake")
|
||||
self.wait_for(lambda: self.signals == [True, False])
|
||||
self.wait_for(lambda: self.asked()[-1:] == ["off"])
|
||||
self.assertEqual(["--steam-idle-inhibit", "on", "--steam-idle-suspend-seconds",
|
||||
"--steam-idle-inhibit", "off"], self.asked())
|
||||
|
||||
|
||||
class WithNetworkManagerTest(SleepHandshakeTest):
|
||||
ARGS = ["--with-netmanager"]
|
||||
|
||||
Reference in new issue
Block a user