ci: adapt dovecot config file to version 2.4

Author: fho

imapclient/acl_test.go

@@ -31,7 +31,7 @@ var testCases = []struct {
 	},
 	{
 		name:                  "custom_child_folder",
-		mailbox:               "MyFolder.Child",
+		mailbox:               "MyFolder/Child",
 		setRightsModification: imap.RightModificationReplace,
 		setRights:             imap.RightSet("aelrwtd"),
 		expectedRights:        imap.RightSet("aelrwtd"),
@@ -52,7 +52,7 @@ var testCases = []struct {
 	},
 	{
 		name:                  "empty_rights",
-		mailbox:               "MyFolder.Child",
+		mailbox:               "MyFolder/Child",
 		setRightsModification: imap.RightModificationReplace,
 		setRights:             imap.RightSet("a"),
 		expectedRights:        imap.RightSet("a"),
@@ -82,13 +82,13 @@ func TestACL(t *testing.T) {
 			// execute SETACL command
 			err := client.SetACL(tc.mailbox, testUsername, tc.setRightsModification, tc.setRights).Wait()
 			if err != nil {
-				t.Errorf("SetACL().Wait() error: %v", err)
+				t.Fatalf("SetACL().Wait() error: %v", err)
 			}
 
 			// execute GETACL command to reset cache on server
 			getACLData, err := client.GetACL(tc.mailbox).Wait()
 			if err != nil {
-				t.Errorf("GetACL().Wait() error: %v", err)
+				t.Fatalf("GetACL().Wait() error: %v", err)
 			}
 
 			if !tc.expectedRights.Equal(getACLData.Rights[testUsername]) {

imapclient/dovecot_test.go

@@ -13,24 +13,32 @@ func newDovecotClientServerPair(t *testing.T) (net.Conn, io.Closer) {
 	tempDir := t.TempDir()
 
 	cfgFilename := filepath.Join(tempDir, "dovecot.conf")
-	cfg := `log_path      = "` + tempDir + `/dovecot.log"
+	cfg := `dovecot_config_version  = 2.4.0
+dovecot_storage_version = 2.4.0
+
+log_path      = "` + tempDir + `/dovecot.log"
 ssl           = no
-mail_home     = "` + tempDir + `/%u"
-mail_location = maildir:~/Mail
+mail_home     = "` + tempDir + `/%{user}"
+mail_driver   = maildir
+mail_path     = "~/Mail"
 
 namespace inbox {
 	separator = /
 	prefix =
 	inbox = yes
 }
 
-mail_plugins = $mail_plugins acl
-protocol imap {
-	mail_plugins = $mail_plugins imap_acl
+mail_plugins {
+	acl = yes
 }
-plugin {
-  acl = vfile
+
+protocol imap {
+	mail_plugins {
+		imap_acl = yes
+	}
 }
+
+acl_driver = vfile
 `
 	if err := os.WriteFile(cfgFilename, []byte(cfg), 0666); err != nil {
 		t.Fatalf("failed to write Dovecot config: %v", err)