From 66aeda7f653cfb72731fe7ff2925d7291158500f Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@debian.org>
Date: Fri, 25 Apr 2025 17:59:57 +0200
Subject: Port tests and documentation to Dovecot 2.4.

See https://doc.dovecot.org/main/installation/upgrade/2.3-to-2.4.html .
---
 tests/repair/t | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'tests/repair/t')

diff --git a/tests/repair/t b/tests/repair/t
index 10fab0d..bdad2e3 100644
--- a/tests/repair/t
+++ b/tests/repair/t
@@ -1,6 +1,6 @@
 # create some mailboxes and populate them
-doveadm -u "local"  mailbox create "foo.bar"
-doveadm -u "remote" mailbox create "foo~bar" "baz"
+doveadm -u "local"  mailbox create --no-userdb-lookup "foo.bar"
+doveadm -u "remote" mailbox create --no-userdb-lookup "foo~bar" "baz"
 for ((i = 0; i < 8; i++)); do
     sample_message | deliver -u "local"  -- -m "foo.bar"
     sample_message | deliver -u "remote" -- -m "foo~bar"
@@ -15,12 +15,12 @@ check_mailboxes_status "foo.bar" "baz" "INBOX"
 
 # make more changes (flag updates, new massages, deletions)
 sample_message | deliver -u "remote" -- -m "INBOX"
-doveadm -u "local"  expunge mailbox "baz" 1:10
-doveadm -u "remote" expunge mailbox "baz" "$(seq -s"," 1 2 32),$(seq -s"," 40 2 64)"
-doveadm -u "local"  expunge mailbox "foo.bar" 2,3,5:7,10
-doveadm -u "remote" expunge mailbox "foo~bar" 4,5,7,10
-doveadm -u "local"  flags add "\\Answered" mailbox "foo.bar" 2,3,5:7,10
-doveadm -u "remote" flags add "\\Seen"     mailbox "foo~bar" 4,5,7
+doveadm -u "local"  expunge --no-userdb-lookup mailbox "baz" 1:10
+doveadm -u "remote" expunge --no-userdb-lookup mailbox "baz" "$(seq -s"," 1 2 32),$(seq -s"," 40 2 64)"
+doveadm -u "local"  expunge --no-userdb-lookup mailbox "foo.bar" 2,3,5:7,10
+doveadm -u "remote" expunge --no-userdb-lookup mailbox "foo~bar" 4,5,7,10
+doveadm -u "local"  flags add --no-userdb-lookup "\\Answered" mailbox "foo.bar" 2,3,5:7,10
+doveadm -u "remote" flags add --no-userdb-lookup "\\Seen"     mailbox "foo~bar" 4,5,7
 
 # spoof HIGHESTMODSEQ value in the database to make it look that we recorded the new changes already
 spoof() {
@@ -28,7 +28,7 @@ spoof() {
     shift
     while [ $# -gt 0 ]; do
         [ "$1" = "local" ] && m="foo.bar" || m="$(printf "%s" "foo.bar" | tr "." "~")"
-        v="$(doveadm -u "$1"  -f flow mailbox status "${k,,[A-Z]}" "$m" | sed 's/.*=//')"
+        v="$(doveadm -u "$1"  -f flow mailbox status --no-userdb-lookup "${k,,[A-Z]}" "$m" | sed 's/.*=//')"
 	    sqlite3 "$XDG_DATA_HOME/interimap/remote.db" <<-EOF
 			UPDATE \`$1\` SET $k = $v
 			 WHERE idx = (SELECT idx FROM mailboxes WHERE mailbox = x'$hex');
@@ -41,8 +41,8 @@ spoof HIGHESTMODSEQ "local" "remote"
 sqlite3 "$XDG_DATA_HOME/interimap/remote.db" >"$TMPDIR/dump.sql" <<-EOF
 	.dump
 EOF
-doveadm -u "local"  mailbox status "all" "foo.bar" >"$TMPDIR/foo-bar.status.local"
-doveadm -u "remote" mailbox status "all" "foo~bar" >"$TMPDIR/foo-bar.status.remote"
+doveadm -u "local"  mailbox status --no-userdb-lookup "all" "foo.bar" >"$TMPDIR/foo-bar.status.local"
+doveadm -u "remote" mailbox status --no-userdb-lookup "all" "foo~bar" >"$TMPDIR/foo-bar.status.remote"
 
 
 # verify that without --repair interimap does nothing due to the spoofed HIGHESTMODSEQ values
@@ -51,8 +51,8 @@ interimap "foo.bar" || error
 sqlite3 "$XDG_DATA_HOME/interimap/remote.db" >"$TMPDIR/dump2.sql" <<-EOF
 	.dump
 EOF
-doveadm -u "local"  mailbox status all "foo.bar" >"$TMPDIR/foo-bar.status2.local"
-doveadm -u "remote" mailbox status all "foo~bar" >"$TMPDIR/foo-bar.status2.remote"
+doveadm -u "local"  mailbox status --no-userdb-lookup all "foo.bar" >"$TMPDIR/foo-bar.status2.local"
+doveadm -u "remote" mailbox status --no-userdb-lookup all "foo~bar" >"$TMPDIR/foo-bar.status2.remote"
 diff -u --label="a/dump.sql"       --label="b/dump.sql"       "$TMPDIR/dump.sql"              "$TMPDIR/dump2.sql"
 diff -u --label="a/foo_bar.local"  --label="a/foo_bar.local"  "$TMPDIR/foo-bar.status.local"  "$TMPDIR/foo-bar.status2.local"
 diff -u --label="a/foo_bar.remote" --label="a/foo_bar.remote" "$TMPDIR/foo-bar.status.remote" "$TMPDIR/foo-bar.status2.remote"
-- 
cgit v1.2.3