Skip to content

Commit 89a97bd

Browse files
committed
tests: adjust tests for Dovecot 2.4
Dovecot 2.4 (used in Debian trixie) changed its configuration significantly. Have two sections for the old and the new version. QubesOS/qubes-issues#8841
1 parent 53a6a27 commit 89a97bd

1 file changed

Lines changed: 8 additions & 3 deletions

File tree

tests/splitgpg/tests.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -448,9 +448,14 @@ def setUp(self):
448448

449449
# IMAP configuration
450450
self.imap_pw = "pass"
451-
self.frontend.run(
452-
'echo "mail_location=maildir:~/Mail\nuserdb {\n driver = passwd\n}\npassdb {\n driver = static\n args = password=pass\n}" |\
453-
tee /etc/dovecot/conf.d/100-mail.conf', wait=True, user="root")
451+
if self.frontend.run("grep -q mail_driver /etc/dovecot/conf.d/10-mail.conf", wait=True) == 0:
452+
self.frontend.run(
453+
'echo "mail_driver = maildir\nmail_path = ~/Mail\nmail_inbox_path = ~/Mail\nuserdb static {\n driver = passwd\n}\npassdb static {\n driver = static\n password=pass\n}" |\
454+
tee /etc/dovecot/conf.d/100-mail.conf', wait=True, user="root")
455+
else:
456+
self.frontend.run(
457+
'echo "mail_location=maildir:~/Mail\nuserdb {\n driver = passwd\n}\npassdb $db_name {\n driver = static\n args = password=pass\n}" |\
458+
tee /etc/dovecot/conf.d/100-mail.conf', wait=True, user="root")
454459
self.frontend.run(
455460
"sed -i 's/^!include/#\\0/' /etc/dovecot/conf.d/10-auth.conf",
456461
wait=True, user="root")

0 commit comments

Comments
 (0)