spalencsar/bearhub
1
0
Fork 0
mirror of https://github.com/spalencsar/bearhub.git synced 2026-07-07 00:04:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

[flatpak] improvement: upgrade requirements sorting

Browse Source
This commit is contained in:
Vinicius Moreira
2022-05-10 18:55:31 -03:00
parent 17b5a48254
commit ea3bb062ef
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bauh/gems/flatpak/controller.py
View File

@@ -720,7 +720,7 @@ class FlatpakManager(SoftwareManager, SettingsController):
for comps in (runtimes, apps): for comps in (runtimes, apps):
if comps: if comps:
comp_list = list(comps) comp_list = list(comps)
comp_list.sort(key=attrgetter('installation', 'name')) comp_list.sort(key=attrgetter('installation', 'name', 'id'))
sorted_list.extend(comp_list) sorted_list.extend(comp_list)
return sorted_list return sorted_list

10
tests/gems/flatpak/test_controller.py
View File

@@ -96,7 +96,7 @@ class FlatpakManagerSortUpdateOrderTest(TestCase):
gnome_locale = FlatpakApplication(id="org.gnome.Platform.Locale", name="Locale", runtime=True, partial=True) gnome_locale = FlatpakApplication(id="org.gnome.Platform.Locale", name="Locale", runtime=True, partial=True)
gnome_locale.base_id = gnome_platform.id gnome_locale.base_id = gnome_platform.id
platform_default = FlatpakApplication(id="org.freedesktop.Platform.GL.default", name='default', runtime=True) platform_default = FlatpakApplication(id="org.freedesktop.Platform.GL.default", name='Default', runtime=True)
platform_locale = FlatpakApplication(id="org.freedesktop.Platform.GL.Locale", name='Locale', runtime=True, partial=True) platform_locale = FlatpakApplication(id="org.freedesktop.Platform.GL.Locale", name='Locale', runtime=True, partial=True)
platform_locale.base_id = platform_default.id platform_locale.base_id = platform_default.id
@@ -113,9 +113,9 @@ class FlatpakManagerSortUpdateOrderTest(TestCase):
self.assertIsInstance(sorted_list, list) self.assertIsInstance(sorted_list, list)
self.assertEqual(len(pkgs), len(sorted_list)) self.assertEqual(len(pkgs), len(sorted_list))
self.assertEqual(gnome_locale.id, sorted_list[0].id) self.assertEqual(platform_default.id, sorted_list[0].id)
self.assertEqual(gnome_platform.id, sorted_list[1].id) self.assertEqual(platform_locale.id, sorted_list[1].id)
self.assertEqual(platform_locale.id, sorted_list[2].id) self.assertEqual(gnome_locale.id, sorted_list[2].id)
self.assertEqual(platform_default.id, sorted_list[3].id) self.assertEqual(gnome_platform.id, sorted_list[3].id)
self.assertEqual('org.gnome.gedit', sorted_list[4].id) self.assertEqual('org.gnome.gedit', sorted_list[4].id)
self.assertEqual('com.spotify.Client', sorted_list[5].id) self.assertEqual('com.spotify.Client', sorted_list[5].id)