mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-21 05:46:03 +00:00
fix(desktop): address KDE feedback and keep local builds in sync with CI (#488)
This commit is contained in:
1 parent
c761b83112
commit
d99ed8e00b
41 files changed
+1252
-191
No files matched your search
@@ -1,8 +1,10 @@
|
||||
import os
|
||||
import json
|
||||
from pathlib import Path
|
||||
import runpy
|
||||
import tempfile
|
||||
import unittest
|
||||
import xml.etree.ElementTree as ET
|
||||
from unittest.mock import patch
|
||||
|
||||
|
||||
@@ -65,5 +67,112 @@ class DesktopBookmarksTest(unittest.TestCase):
|
||||
self.assertEqual(self.bookmarks.read_text(), "")
|
||||
|
||||
|
||||
class DolphinPlacesTest(unittest.TestCase):
|
||||
def setUp(self):
|
||||
temporary = tempfile.TemporaryDirectory()
|
||||
self.addCleanup(temporary.cleanup)
|
||||
self.home = Path(temporary.name)
|
||||
self.data = self.home / ".local/share"
|
||||
self.steam = self.data / "Steam"
|
||||
(self.steam / "steamapps").mkdir(parents=True)
|
||||
self.places = self.data / "user-places.xbel"
|
||||
self.environment = patch.dict(os.environ, {}, clear=True)
|
||||
self.environment.start()
|
||||
self.addCleanup(self.environment.stop)
|
||||
|
||||
def registered(self, libraries):
|
||||
entries = []
|
||||
for index, (path, label) in enumerate(libraries):
|
||||
quote = lambda s: json.dumps(str(s), ensure_ascii=False)
|
||||
entries.append(f'"{index}" {{ "path" {quote(path)} "label" {quote(label)} "apps" {{ "1" "0" }} }}')
|
||||
(self.steam / "steamapps/libraryfolders.vdf").write_text('"libraryfolders" { ' + " ".join(entries) + ' }')
|
||||
|
||||
def libraries(self):
|
||||
return MODULE["steam_libraries"](self.home, self.data)
|
||||
|
||||
def update(self, libraries):
|
||||
MODULE["update_places"](self.places, libraries)
|
||||
return ET.parse(self.places).getroot()
|
||||
|
||||
def test_internal_and_all_available_registered_libraries_with_escaped_names(self):
|
||||
external = self.home / 'USB café "Games"'
|
||||
(external / "steamapps").mkdir(parents=True)
|
||||
missing = self.home / "removed drive"
|
||||
self.registered([(self.steam, ""), (external, 'Games "USB"'), (missing, "Gone")])
|
||||
self.assertEqual({self.steam.as_uri(): "Steam (Internal Storage)", external.as_uri(): 'Steam (Games "USB")'}, self.libraries())
|
||||
|
||||
def test_app_list_adds_new_library_before_steam_and_removes_unbound_managed_path(self):
|
||||
old = self.home / "Games/old"
|
||||
new = self.home / "Games/new"
|
||||
for library in (old, new):
|
||||
(library / "steamapps").mkdir(parents=True)
|
||||
self.registered([(old, "Old")])
|
||||
listing = self.home / "libraries.json"
|
||||
listing.write_text(json.dumps([{"path": str(new), "label": "New\nLibrary"}]))
|
||||
os.environ["BL_STEAM_LIBRARIES"] = str(listing)
|
||||
self.assertEqual({self.steam.as_uri(): "Steam (Internal Storage)", new.as_uri(): "Steam (New Library)"}, self.libraries())
|
||||
|
||||
def test_unreadable_app_list_falls_back_to_registered_libraries(self):
|
||||
external = self.home / "USB"
|
||||
(external / "steamapps").mkdir(parents=True)
|
||||
self.registered([(external, "Drive")])
|
||||
os.environ["BL_STEAM_LIBRARIES"] = str(self.home / "missing.json")
|
||||
self.assertIn(external.as_uri(), self.libraries())
|
||||
|
||||
def test_xml_escaping_stable_ids_and_idempotence(self):
|
||||
libraries = {self.steam.as_uri(): "Steam (A & <B>)"}
|
||||
root = self.update(libraries)
|
||||
self.assertEqual("Steam (A & <B>)", root.findtext("bookmark/title"))
|
||||
identity = root.findtext("bookmark/info/metadata[@owner='http://www.kde.org']/ID")
|
||||
before = self.places.stat().st_mtime_ns
|
||||
self.update(libraries)
|
||||
self.assertEqual(before, self.places.stat().st_mtime_ns)
|
||||
root = self.update({self.steam.as_uri(): "Renamed"})
|
||||
self.assertEqual(identity, root.findtext("bookmark/info/metadata[@owner='http://www.kde.org']/ID"))
|
||||
self.assertEqual("Renamed", root.findtext("bookmark/title"))
|
||||
|
||||
def test_personal_places_and_metadata_survive_unplugging_and_returning(self):
|
||||
personal = '<bookmark href="file:///root/Documents"><title>Mine</title><info><metadata owner="custom"><private>keep</private></metadata></info></bookmark>'
|
||||
self.places.write_text('<xbel version="1.0"><!--keep comment-->' + personal + '</xbel>')
|
||||
self.update({self.steam.as_uri(): "Steam"})
|
||||
root = self.update({})
|
||||
self.assertEqual(["file:///root/Documents"], [b.get("href") for b in root.findall("bookmark")])
|
||||
self.assertEqual("keep", root.findtext("bookmark/info/metadata/private"))
|
||||
self.assertIn("<!--keep comment-->", self.places.read_text())
|
||||
self.assertEqual(2, len(self.update({self.steam.as_uri(): "Steam"}).findall("bookmark")))
|
||||
|
||||
def test_personal_place_at_library_url_is_not_duplicated_renamed_or_removed(self):
|
||||
self.places.write_text(f'<xbel><bookmark href="{self.steam.as_uri()}"><title>My games</title></bookmark></xbel>')
|
||||
before = self.places.read_bytes()
|
||||
self.update({self.steam.as_uri(): "Steam"})
|
||||
self.update({})
|
||||
self.assertEqual(before, self.places.read_bytes())
|
||||
|
||||
def test_user_hidden_state_on_managed_place_is_kept(self):
|
||||
root = self.update({self.steam.as_uri(): "Steam"})
|
||||
metadata = root.find("bookmark/info/metadata[@owner='http://www.kde.org']")
|
||||
ET.SubElement(metadata, "IsHidden").text = "true"
|
||||
self.places.write_bytes(ET.tostring(root))
|
||||
root = self.update({self.steam.as_uri(): "Renamed"})
|
||||
self.assertEqual("true", root.findtext("bookmark/info/metadata/IsHidden"))
|
||||
|
||||
def test_personal_place_with_trailing_slash_is_not_duplicated(self):
|
||||
self.places.write_text(f'<xbel><bookmark href="{self.steam.as_uri()}/"><title>My games</title></bookmark></xbel>')
|
||||
root = self.update({self.steam.as_uri(): "Steam"})
|
||||
self.assertEqual(1, len(root.findall("bookmark")))
|
||||
self.assertEqual("My games", root.findtext("bookmark/title"))
|
||||
|
||||
def test_invalid_xml_is_not_overwritten(self):
|
||||
self.places.write_text("<xbel>unfinished")
|
||||
with self.assertRaises(ET.ParseError):
|
||||
self.update({self.steam.as_uri(): "Steam"})
|
||||
self.assertEqual("<xbel>unfinished", self.places.read_text())
|
||||
|
||||
def test_new_places_leave_default_version_for_kde_to_initialize(self):
|
||||
root = self.update({self.steam.as_uri(): "Steam"})
|
||||
self.assertEqual("1.0", root.get("version"))
|
||||
self.assertIsNone(root.find("info/metadata/Version"))
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
@@ -0,0 +1,76 @@
|
||||
import importlib.util
|
||||
import io
|
||||
from pathlib import Path
|
||||
import subprocess
|
||||
import tarfile
|
||||
import tempfile
|
||||
import unittest
|
||||
from zipfile import ZipFile
|
||||
|
||||
|
||||
spec = importlib.util.spec_from_file_location('runtime_inputs', Path(__file__).resolve().parents[1] / 'release/runtime_inputs.py')
|
||||
runtime = importlib.util.module_from_spec(spec)
|
||||
spec.loader.exec_module(runtime)
|
||||
|
||||
|
||||
class RuntimeInputsTest(unittest.TestCase):
|
||||
def setUp(self):
|
||||
self.temp = tempfile.TemporaryDirectory()
|
||||
self.addCleanup(self.temp.cleanup)
|
||||
self.root = Path(self.temp.name)
|
||||
paths = runtime.outputs(self.root)
|
||||
for name in runtime.required():
|
||||
path = self.root / paths.get(name, 'app/src/main/' + name)
|
||||
path.parent.mkdir(parents=True, exist_ok=True)
|
||||
path.write_bytes(b'prepared runtime')
|
||||
self.source = self.root / 'tools/linuxfs/preload/test.c'
|
||||
self.source.parent.mkdir(parents=True)
|
||||
self.source.write_text('current source')
|
||||
self.audio(['pactl', 'modules/arm64/module-aaudio-sink.so', 'modules/arm64/module-directaudio-native-sink.so'])
|
||||
|
||||
def audio(self, names):
|
||||
stream = io.BytesIO()
|
||||
with tarfile.open(fileobj=stream, mode='w') as archive:
|
||||
for name in names:
|
||||
entry = tarfile.TarInfo('./' + name)
|
||||
entry.size = 1
|
||||
archive.addfile(entry, io.BytesIO(b'x'))
|
||||
path = self.root / 'app/build/prepared-assets/pulseaudio.tzst'
|
||||
path.write_bytes(subprocess.run(['zstd', '-q', '-c'], input=stream.getvalue(), capture_output=True, check=True).stdout)
|
||||
|
||||
def test_missing_proot_cannot_be_attested(self):
|
||||
(self.root / 'app/src/main/jniLibs/arm64-v8a/libproot.so').unlink()
|
||||
with self.assertRaisesRegex(ValueError, 'libproot.so'):
|
||||
runtime.record(self.root)
|
||||
|
||||
def test_base_audio_without_compiled_sinks_is_rejected(self):
|
||||
self.audio(['pactl'])
|
||||
with self.assertRaisesRegex(ValueError, 'module-aaudio-sink'):
|
||||
runtime.record(self.root)
|
||||
|
||||
def test_changed_native_source_rejects_old_outputs(self):
|
||||
runtime.record(self.root)
|
||||
self.source.write_text('new implementation')
|
||||
with self.assertRaisesRegex(ValueError, 'sources changed'):
|
||||
runtime.verify(self.root)
|
||||
|
||||
def test_modified_prebuilt_binary_is_rejected(self):
|
||||
runtime.record(self.root)
|
||||
(self.root / 'app/src/main/jniLibs/arm64-v8a/libproot.so').write_bytes(b'old APK binary')
|
||||
with self.assertRaisesRegex(ValueError, 'changed runtime input'):
|
||||
runtime.verify(self.root)
|
||||
|
||||
def test_an_old_apk_is_rejected_even_when_staging_is_current(self):
|
||||
runtime.record(self.root)
|
||||
data = runtime.verify(self.root)
|
||||
apk = self.root / 'old.apk'
|
||||
with ZipFile(apk, 'w') as package:
|
||||
for name, output in data['outputs'].items():
|
||||
content = b'stale' if name == 'assets/linuxfs/libssbs.so' else (self.root / output['path']).read_bytes()
|
||||
package.writestr(name, content)
|
||||
with self.assertRaisesRegex(ValueError, 'stale runtime input'):
|
||||
runtime.check_apk(apk, self.root)
|
||||
|
||||
def test_complete_current_payload_passes(self):
|
||||
runtime.record(self.root)
|
||||
runtime.verify(self.root)
|
||||
@@ -0,0 +1,23 @@
|
||||
import runpy
|
||||
from pathlib import Path
|
||||
import unittest
|
||||
from unittest.mock import Mock, patch
|
||||
|
||||
|
||||
select_desktop = runpy.run_path(str(Path(__file__).resolve().parents[1] /
|
||||
'linuxfs/overlay/usr/local/bin/droiddeck-steam-desktop-ui'))['select_desktop']
|
||||
|
||||
|
||||
class SteamDesktopUiTest(unittest.TestCase):
|
||||
def test_waits_for_cef_and_native_api_then_selects_once(self):
|
||||
evaluate = Mock(side_effect=[ConnectionError(), {'value': False}, {'value': True}])
|
||||
with patch('time.sleep'):
|
||||
self.assertTrue(select_desktop(evaluate))
|
||||
self.assertEqual(evaluate.call_count, 3)
|
||||
self.assertIn('SteamClient.UI.ExitBigPictureMode()', evaluate.call_args.args[0])
|
||||
|
||||
def test_a_client_that_never_starts_has_a_bounded_wait(self):
|
||||
evaluate = Mock()
|
||||
with patch('time.monotonic', side_effect=[0, 91]):
|
||||
self.assertFalse(select_desktop(evaluate))
|
||||
evaluate.assert_not_called()
|
||||
Reference in new issue
Block a user