mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-18 20:36:04 +00:00
fix: game debug logs also reach games started by a store client (#2343)
fix: propagate store launcher debug environment
This commit is contained in:
1 parent
a9524ea991
commit
448d296a2b
7 files changed
+138
-54
No files matched your search
@@ -47,6 +47,47 @@ class LogTest(Temp):
|
||||
self.assertRegex(log.read_text(), r"^\d{4}-\d\d-\d\d \d\d:\d\d:\d\d \[\d+\] second\n$")
|
||||
|
||||
|
||||
class StoreDebugEnvironmentTest(Temp):
|
||||
def config(self, enabled):
|
||||
config = self.tmp / ".config/droiddeck/game-environment.json"
|
||||
config.parent.mkdir(parents=True, exist_ok=True)
|
||||
config.write_text(json.dumps({"version": 1, "gameDebugLogs": enabled}))
|
||||
|
||||
def env(self, values=None):
|
||||
debug_dir = self.tmp / "session"
|
||||
debug_dir.mkdir(exist_ok=True)
|
||||
base = {"HOME": str(self.tmp), "BL_DEBUG_DIR": str(debug_dir)}
|
||||
base.update(values or {})
|
||||
return base
|
||||
|
||||
def test_store_proton_command_gets_debug_defaults_when_enabled(self):
|
||||
self.config(True)
|
||||
with mock.patch.dict(os.environ, self.env(), clear=True):
|
||||
result = BNET["proton_env"]()
|
||||
self.assertEqual(result["PROTON_LOG"], "1")
|
||||
self.assertEqual(result["DXVK_LOG_LEVEL"], "debug")
|
||||
self.assertEqual(result["PROTON_LOG_DIR"], str(self.tmp / "session"))
|
||||
self.assertIn("+seh", result["WINEDEBUG"])
|
||||
|
||||
def test_store_proton_command_keeps_debug_off_when_disabled(self):
|
||||
self.config(False)
|
||||
with mock.patch.dict(os.environ, self.env(), clear=True):
|
||||
result = BNET["proton_env"]()
|
||||
self.assertNotIn("PROTON_LOG", result)
|
||||
self.assertNotIn("DXVK_LOG_LEVEL", result)
|
||||
|
||||
def test_store_proton_command_keeps_user_debug_values(self):
|
||||
self.config(True)
|
||||
values = {"PROTON_LOG": "0", "DXVK_LOG_LEVEL": "none", "WINEDEBUG": "-all", "PROTON_LOG_DIR": "/custom"}
|
||||
with mock.patch.dict(os.environ, self.env(values), clear=True):
|
||||
result = BNET["proton_env"]()
|
||||
self.assertEqual(result["PROTON_LOG"], "1")
|
||||
self.assertEqual(result["DXVK_LOG_LEVEL"], "debug")
|
||||
self.assertEqual(result["PROTON_LOG_DIR"], str(self.tmp / "session"))
|
||||
self.assertIn("+seh", result["WINEDEBUG"])
|
||||
self.assertIn("-all", result["WINEDEBUG"])
|
||||
|
||||
|
||||
class IdTest(unittest.TestCase):
|
||||
def test_the_prefix_id_is_the_shortcut_id_the_app_names(self):
|
||||
self.assertEqual(int(BNET["APP_ID"]), zlib.crc32(b'"droiddeck-battlenet"Battle.net') | 0x80000000)
|
||||
|
||||
@@ -887,17 +887,28 @@ class BrokerTest(EpicTestCase):
|
||||
folder.mkdir()
|
||||
(folder / ".droiddeck-store.json").write_text(json.dumps({"store": "epic", "id": "Fig", "args": ["-x"]}))
|
||||
(folder / ".droiddeck-launch.bat").write_text('if exist "%~dp0.droiddeck-epic-args" goto client\r\n')
|
||||
debug_dir = self.tmp / "session"
|
||||
debug_dir.mkdir()
|
||||
config = self.home / ".config/droiddeck/game-environment.json"
|
||||
config.parent.mkdir(parents=True)
|
||||
config.write_text(json.dumps({"version": 1, "gameDebugLogs": True}))
|
||||
calls = []
|
||||
|
||||
def popen(command, env=None, cwd=None, start_new_session=False):
|
||||
calls.append((command, env.get("DROIDDECK_EPIC_HANDLED"), start_new_session))
|
||||
calls.append((command, env.get("DROIDDECK_EPIC_HANDLED"), env.get("BL_DEBUG_DIR"),
|
||||
env.get("PROTON_LOG"), env.get("WINEDEBUG"), start_new_session))
|
||||
return mock.Mock(wait=mock.Mock(return_value=7))
|
||||
|
||||
running = []
|
||||
with mock.patch.object(subprocess, "Popen", popen):
|
||||
code = G["run_game"]({"exe": str(folder / "Fig.exe"), "args": ["-epicapp=Fig"]}, {"PATH": "/usr/bin"}, running)
|
||||
with mock.patch.dict(os.environ, {"HOME": str(self.home), "BL_DEBUG_DIR": str(debug_dir),
|
||||
"PROTON_LOG": "0", "WINEDEBUG": "-all"}), \
|
||||
mock.patch.object(subprocess, "Popen", popen):
|
||||
code = G["run_game"]({"exe": str(folder / "Fig.exe"), "args": ["-epicapp=Fig"]},
|
||||
{"PATH": "/usr/bin", "BL_DEBUG_DIR": str(debug_dir)}, running)
|
||||
self.assertEqual(7, code)
|
||||
self.assertEqual(([G["PROTON_RUN"], str(folder / ".droiddeck-launch.bat")], "1", True), calls[0])
|
||||
self.assertEqual(([G["PROTON_RUN"], str(folder / ".droiddeck-launch.bat")], "1", str(debug_dir), "1",
|
||||
mock.ANY, True), calls[0])
|
||||
self.assertIn("+seh", calls[0][4])
|
||||
self.assertEqual([], running)
|
||||
self.assertEqual(b"-epicapp=Fig -x\r\n", (folder / ".droiddeck-epic-args").read_bytes())
|
||||
|
||||
|
||||
Reference in new issue
Block a user