From 53a296f8b629e002b13f328c74ff905963f75dc4 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Wed, 6 Mar 2024 14:36:38 +0100
Subject: tests/*/t: Replace filetype=sh with filetype=bash.

---
 tests/pullimap/t | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/pullimap/t')

diff --git a/tests/pullimap/t b/tests/pullimap/t
index 58a19ca..879c5d1 100644
--- a/tests/pullimap/t
+++ b/tests/pullimap/t
@@ -149,4 +149,4 @@ doveadm -u "remote" search mailbox "$MAILBOX" all >"$TMPDIR/messages"
 [ ! -s "$TMPDIR/messages" ] || error "messages left"
 step_done
 
-# vim: set filetype=sh :
+# vim: set filetype=bash :
-- 
cgit v1.2.3


From 8f11b2625b98831a591a73c8928d62c1df11aadb Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Fri, 5 Apr 2024 20:40:58 +0200
Subject: tests: Ensure that pullimap locks its statefile.

---
 tests/pullimap/t | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'tests/pullimap/t')

diff --git a/tests/pullimap/t b/tests/pullimap/t
index 879c5d1..e508784 100644
--- a/tests/pullimap/t
+++ b/tests/pullimap/t
@@ -13,6 +13,17 @@ if ! st="$(stat -c"%#a" -- "$XDG_DATA_HOME/pullimap/remote")" || [ "$st" != "060
 fi
 step_done
 
+step_start "\`pullimap\` locks its statefile"
+pullimap --idle "remote" & PID=$!
+trap "ptree_abort $PID" EXIT INT TERM
+# wait a short while so we have time to lock the database (ugly and racy...)
+sleep .5
+! pullimap "remote" || error
+grep -F "Can't lock $XDG_DATA_HOME/pullimap/remote: Resource temporarily unavailable at " <"$STDERR" || error
+ptree_abort $PID
+trap - EXIT INT TERM
+step_done
+
 # compare mailboxes (can't compare the RFC 3501 TEXT as the LMTPd inconditionally
 # adds a Return-Path: header -- and also Delivered-To: and Received: to by default)
 list_mails_sha256() {
-- 
cgit v1.2.3


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/pullimap/t | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'tests/pullimap/t')

diff --git a/tests/pullimap/t b/tests/pullimap/t
index e508784..1c57f8d 100644
--- a/tests/pullimap/t
+++ b/tests/pullimap/t
@@ -30,8 +30,8 @@ list_mails_sha256() {
     local u="$1" guid uid
     local fields="body date.sent imap.bodystructure imap.envelope"
     while read guid uid; do
-        doveadm -u "$u" -f "flow" fetch "$fields" mailbox-guid "$guid" uid "$uid" | sha256sum
-    done < <(doveadm -u "$u" search mailbox "$MAILBOX") | sort -f
+        doveadm -u "$u" -f "flow" fetch --no-userdb-lookup "$fields" mailbox-guid "$guid" uid "$uid" | sha256sum
+    done < <(doveadm -u "$u" search mailbox --no-userdb-lookup "$MAILBOX") | sort -f
 }
 check() {
     diff -u --label="local/mails" --label="remote/mails" \
@@ -91,7 +91,7 @@ step_done
 
 
 # make sure remote UIDs are 11-bytes long
-doveadm -u "remote" mailbox update --min-next-uid 1000000000 "$MAILBOX"
+doveadm -u "remote" mailbox update --no-userdb-lookup --min-next-uid 1000000000 "$MAILBOX"
 
 # Add some messages and sync
 step_start "Fetching messages"
@@ -109,7 +109,7 @@ for ((i = 0; i < N; i+=2)); do
 done
 for ((i = 0; i < N; i+=2)); do
     # expunge every other message
-    doveadm -u "remote" expunge mailbox "$MAILBOX" $((N-i+32+7))
+    doveadm -u "remote" expunge --no-userdb-lookup mailbox "$MAILBOX" $((N-i+32+7))
     sample_message | deliver -u "remote" -- -m "$MAILBOX"
 done
 
@@ -117,7 +117,7 @@ pullimap "remote" || error
 check
 
 # count unseen remote messages
-doveadm -u "remote" search mailbox "$MAILBOX" unseen >"$TMPDIR/unseen"
+doveadm -u "remote" search --no-userdb-lookup mailbox "$MAILBOX" unseen >"$TMPDIR/unseen"
 [ ! -s "$TMPDIR/unseen" ] || error "\\Unseen messages left"
 step_done
 
@@ -156,7 +156,7 @@ for ((i = 0; i < 32; i++)); do
 done
 pullimap "remote"
 
-doveadm -u "remote" search mailbox "$MAILBOX" all >"$TMPDIR/messages"
+doveadm -u "remote" search --no-userdb-lookup mailbox "$MAILBOX" all >"$TMPDIR/messages"
 [ ! -s "$TMPDIR/messages" ] || error "messages left"
 step_done
 
-- 
cgit v1.2.3