Skip to content

Commit 7b154aa

Browse files
committed
tests: update for Thunderbird version/config in Whonix 17
Only press 'Get Messages' button to trigger the password prompt. In Whonix, at this point the mail folders list is not available yet, so cannot click 'Inbox' before entering the password.
1 parent ba91eeb commit 7b154aa

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

tests/test_thunderbird.py

+6-2
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ def enter_imap_passwd(tb):
158158
))
159159
except tree.SearchError:
160160
# check new mail so client can realize IMAP requires entering a password
161-
get_messages(tb)
161+
get_messages(tb, button_only=True)
162162
# password entry
163163
pass_prompt = tb.app.findChild(orPredicate(
164164
GenericPredicate(name='Enter your password for user', roleName='frame'),
@@ -268,7 +268,7 @@ def configure_openpgp_account(tb):
268268
'click')
269269

270270

271-
def get_messages(tb):
271+
def get_messages(tb, button_only=False):
272272
try:
273273
# TB >= 115
274274
try:
@@ -277,6 +277,8 @@ def get_messages(tb):
277277
except tree.SearchError:
278278
# TB < 128
279279
tb.app.button('Get Messages').doActionNamed('press')
280+
if button_only:
281+
return
280282
tb.app.child(name='Inbox.*', roleName='tree item').doActionNamed(
281283
'activate')
282284
except tree.SearchError:
@@ -285,6 +287,8 @@ def get_messages(tb):
285287
roleName='table row').doActionNamed('activate')
286288
tb.app.button('Get Messages').doActionNamed('press')
287289
tb.app.menuItem('Get All New Messages').doActionNamed('click')
290+
if button_only:
291+
return
288292
tb.app.child(name='Inbox.*', roleName='table row').doActionNamed(
289293
'activate')
290294

0 commit comments

Comments
 (0)