Skip to content

Commit

Permalink
tests: support the new(er) Thunderbird name on F41+
Browse files Browse the repository at this point in the history
Fedora 41 use yet another desktop app id.

QubesOS/qubes-issues#9244

(cherry picked from commit 30bee56)
  • Loading branch information
marmarek committed Feb 18, 2025
1 parent c81ee70 commit 31128d0
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion qubes/tests/integ/dispvm.py
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,12 @@ def _get_open_script(self, application):
"app = tree.root.application('org.gnome.Nautilus')\n"
"app.child(os.path.basename(sys.argv[1])).doubleClick()\n"
).encode()
if application in ('mozilla-thunderbird', 'thunderbird', 'org.mozilla.thunderbird'):
if application in (
"mozilla-thunderbird",
"thunderbird",
"org.mozilla.thunderbird",
"net.thunderbird.Thunderbird",
):
with open('/usr/share/qubes/tests-data/'
'dispvm-open-thunderbird-attachment', 'rb') as f:
return f.read()
Expand Down Expand Up @@ -431,6 +436,9 @@ def test_100_open_in_dispvm(self):
# F40+ has org.mozilla.thunderbird
if 'org.mozilla.thunderbird' in self._get_apps_list(self.template):
app_id = 'org.mozilla.thunderbird'
# F41+ has net.thunderbird.Thunderbird
if "net.thunderbird.Thunderbird" in self._get_apps_list(self.template):
app_id = "net.thunderbird.Thunderbird"

self.testvm1.features['service.app-dispvm.' + app_id] = '1'
self.loop.run_until_complete(self.testvm1.start())
Expand Down

0 comments on commit 31128d0

Please sign in to comment.