mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-22 14:26:00 +00:00
refactor: Steam always runs in Deck mode on the Deck beta branch (#546)
This commit is contained in:
1 parent
a2e596a200
commit
b47302eb8c
19 files changed
+45
-247
No files matched your search
@@ -45,8 +45,7 @@ cp "$TEST_CDN/${2##*/}" "$4"
|
||||
self.env = dict(os.environ, HOME=str(self.home), XDG_DATA_HOME=str(self.data),
|
||||
PATH=str(self.bin) + os.pathsep + os.environ['PATH'],
|
||||
TEST_CDN=str(self.cdn), TEST_REQUESTS=str(self.requests))
|
||||
self.env.pop('BL_STEAM_CHANNEL', None)
|
||||
for channel in ('publicbeta', 'steamdeck_publicbeta'):
|
||||
for channel in ('steamdeck_publicbeta',):
|
||||
archive = self.cdn / (channel + '.zip')
|
||||
with zipfile.ZipFile(archive, 'w') as package:
|
||||
package.writestr('steamrtarm64/steam', channel)
|
||||
@@ -58,14 +57,11 @@ cp "$TEST_CDN/${2##*/}" "$4"
|
||||
f'\t\t"file" "{archive.name}"\n\t\t"sha2" "{digest}"\n'
|
||||
'\t}\n}\n')
|
||||
|
||||
def install(self, channel=None):
|
||||
env = self.env.copy()
|
||||
if channel is not None:
|
||||
env['BL_STEAM_CHANNEL'] = channel
|
||||
return subprocess.run(['bash', str(SCRIPT)], env=env, text=True, capture_output=True)
|
||||
def install(self):
|
||||
return subprocess.run(['bash', str(SCRIPT)], env=self.env, text=True, capture_output=True)
|
||||
|
||||
def assert_installed(self, channel):
|
||||
result = self.install(channel)
|
||||
def assert_installed(self, channel='steamdeck_publicbeta'):
|
||||
result = self.install()
|
||||
self.assertEqual(0, result.returncode, result.stderr)
|
||||
self.assertEqual(channel + '\n', (self.steam / 'package/beta').read_text())
|
||||
self.assertEqual('123456\n', (self.steam / 'package/droiddeck-installed').read_text())
|
||||
@@ -78,38 +74,31 @@ cp "$TEST_CDN/${2##*/}" "$4"
|
||||
'https://client-update.fastly.steamstatic.com/' + channel + '.zip',
|
||||
], self.requests.read_text().splitlines())
|
||||
|
||||
def test_unset_channel_downloads_deck_beta(self):
|
||||
def test_downloads_the_deck_beta_client(self):
|
||||
self.assert_installed()
|
||||
|
||||
def test_an_install_from_another_branch_is_left_for_steam_to_move(self):
|
||||
# An older app could install publicbeta; droiddeck-session moves the client at its start.
|
||||
self.assert_installed()
|
||||
requests = self.requests.read_text()
|
||||
(self.steam / 'package/beta').write_text('publicbeta\n')
|
||||
result = self.install()
|
||||
self.assertEqual(0, result.returncode, result.stderr)
|
||||
self.assertEqual('steamdeck_publicbeta\n', (self.steam / 'package/beta').read_text())
|
||||
self.assertIn('/steam_client_steamdeck_publicbeta_linuxarm64\n', self.requests.read_text())
|
||||
|
||||
def test_explicit_deck_beta_downloads_matching_client(self):
|
||||
self.assert_installed('steamdeck_publicbeta')
|
||||
|
||||
def test_explicit_public_beta_downloads_matching_client(self):
|
||||
self.assert_installed('publicbeta')
|
||||
|
||||
def test_existing_install_is_left_for_steam_to_update(self):
|
||||
self.assert_installed('steamdeck_publicbeta')
|
||||
requests = self.requests.read_text()
|
||||
result = self.install('publicbeta')
|
||||
self.assertEqual(0, result.returncode, result.stderr)
|
||||
self.assertEqual(requests, self.requests.read_text())
|
||||
self.assertEqual('steamdeck_publicbeta\n', (self.steam / 'package/beta').read_text())
|
||||
|
||||
def test_failed_download_has_no_ready_marker_and_can_retry(self):
|
||||
archive = self.cdn / 'publicbeta.zip'
|
||||
original = archive.read_bytes()
|
||||
archive.write_bytes(b'corrupt download')
|
||||
self.assertNotEqual(0, self.install('publicbeta').returncode)
|
||||
self.assertFalse((self.steam / 'package/droiddeck-installed').exists())
|
||||
archive.write_bytes(original)
|
||||
self.assertEqual(0, self.install('publicbeta').returncode)
|
||||
self.assertEqual('publicbeta\n', (self.steam / 'package/beta').read_text())
|
||||
|
||||
def test_failed_download_has_no_ready_marker_and_can_retry(self):
|
||||
archive = self.cdn / 'steamdeck_publicbeta.zip'
|
||||
original = archive.read_bytes()
|
||||
archive.write_bytes(b'corrupt download')
|
||||
self.assertNotEqual(0, self.install().returncode)
|
||||
self.assertFalse((self.steam / 'package/droiddeck-installed').exists())
|
||||
archive.write_bytes(original)
|
||||
self.assertEqual(0, self.install().returncode)
|
||||
self.assertEqual('steamdeck_publicbeta\n', (self.steam / 'package/beta').read_text())
|
||||
|
||||
def break_client(self, starts):
|
||||
self.assert_installed('steamdeck_publicbeta')
|
||||
self.assert_installed()
|
||||
self.requests.unlink()
|
||||
package = self.steam / 'package'
|
||||
(self.steam / 'steamrtarm64/steam').write_text('half updated')
|
||||
@@ -125,7 +114,7 @@ cp "$TEST_CDN/${2##*/}" "$4"
|
||||
|
||||
def test_two_starts_with_nothing_shown_fetch_the_client_again(self):
|
||||
package = self.break_client(2)
|
||||
self.assert_installed('steamdeck_publicbeta')
|
||||
self.assert_installed()
|
||||
self.assertEqual('repaired\n', (package / 'droiddeck-unconfirmed').read_text())
|
||||
self.assertFalse((self.steam / '.crash').exists())
|
||||
self.assertEqual([], sorted(p.name for p in package.glob('steam_client_*')))
|
||||
@@ -161,18 +150,12 @@ cp "$TEST_CDN/${2##*/}" "$4"
|
||||
self.assertFalse((package / 'droiddeck-installed').exists())
|
||||
archive.write_bytes(original)
|
||||
self.requests.unlink()
|
||||
self.assert_installed('steamdeck_publicbeta')
|
||||
self.assert_installed()
|
||||
self.assertFalse(request.exists())
|
||||
self.requests.unlink()
|
||||
self.assertEqual(0, self.install().returncode)
|
||||
self.assertFalse(self.requests.exists())
|
||||
|
||||
def test_invalid_channel_fails_before_any_download(self):
|
||||
result = self.install('../unknown')
|
||||
self.assertNotEqual(0, result.returncode)
|
||||
self.assertIn('unsupported Steam channel', result.stderr)
|
||||
self.assertFalse(self.requests.exists())
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
Reference in new issue
Block a user