From e9daabf94fbe788cebd95e7e1df486221d3b0c18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Fri, 4 Apr 2025 10:56:27 +0200 Subject: [PATCH 1/2] tests: adjust error handling Don't use 'finally' for code that shouldn't run if both normal and fallback methods failed. Simply move it outside of the 'try' block. --- tests/test_thunderbird.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/test_thunderbird.py b/tests/test_thunderbird.py index fefcaba..9ff36d4 100644 --- a/tests/test_thunderbird.py +++ b/tests/test_thunderbird.py @@ -484,8 +484,7 @@ def receive_message(tb, signed=False, encrypted=False, attachment=None): # alternative way of opening 'message security' keyCombo('s') message_security = tb.app.child('Message Security - OpenPGP') - finally: - message_security = message_security.parent.parent + message_security = message_security.parent.parent try: if signed: message_security.child('Good Digital Signature') From e723bd61e0eefb847660feb476d564db4afb4ace Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Sun, 6 Apr 2025 00:01:35 +0200 Subject: [PATCH 2/2] tests: adjust disabling donation prompt, yet again The mechanism to disable it changed again... This affects at least the version in Debian 12. --- tests/splitgpg/tests.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/splitgpg/tests.py b/tests/splitgpg/tests.py index e079adc..2853676 100644 --- a/tests/splitgpg/tests.py +++ b/tests/splitgpg/tests.py @@ -505,6 +505,7 @@ def setup_tb_profile(self, setup_openpgp): user_pref("mail.identity.id1.compose_html", false); user_pref("datareporting.policy.dataSubmissionEnabled", false); // avoid message popups user_pref("app.donation.eoy.version.viewed", 100); // avoid message popups +user_pref("mail.inappnotifications.enabled", false); // avoid message popups """ imap_server = """ user_pref("mail.server.server1.userName", "user");