Merge tag 'v0.5.8' into debian/latest

Release version 0.5.8

2 files changed, 34 insertions, 30 deletions

diff --git a/tests/sync-live-multi/local.conf b/tests/sync-live-multi/local.conf
index baae39d..6d64a84 100644
--- a/tests/sync-live-multi/local.conf
+++ b/tests/sync-live-multi/local.conf
@@ -1,30 +1,34 @@
 namespace inbox {
-    separator = /
-    location  = dbox:~/inbox:LAYOUT=index
-    inbox     = yes
-    list      = yes
+    separator   = /
+    mail_driver = sdbox
+    mail_path   = ~/inbox
+    inbox       = yes
+    list        = yes
 }
 
 namespace foo {
-    separator = /
-    prefix    = foo/
-    location  = dbox:~/foo:LAYOUT=index
-    inbox     = no
-    list      = yes
+    separator   = /
+    prefix      = foo/
+    mail_driver = sdbox
+    mail_path   = ~/foo
+    inbox       = no
+    list        = yes
 }
 
 namespace bar {
-    separator = /
-    prefix    = bar/
-    location  = dbox:~/bar:LAYOUT=index
-    inbox     = no
-    list      = yes
+    separator   = /
+    prefix      = bar/
+    mail_driver = sdbox
+    mail_path   = ~/bar
+    inbox       = no
+    list        = yes
 }
 
 namespace baz {
     separator = /
-    prefix    = baz/
-    location  = dbox:~/baz:LAYOUT=index
-    inbox     = no
-    list      = yes
+    prefix      = baz/
+    mail_driver = sdbox
+    mail_path   = ~/baz
+    inbox       = no
+    list        = yes
 }
diff --git a/tests/sync-live-multi/t b/tests/sync-live-multi/t
index ba7f326..5a651f5 100644
--- a/tests/sync-live-multi/t
+++ b/tests/sync-live-multi/t
@@ -49,15 +49,15 @@ while [ $(date +%s) -le $timer ]; do
             remote3) m="${m//\//\?}";;
             *) error "Uh?";;
         esac
-        doveadm -u "$u" mailbox create -- "$m"
+        doveadm -u "$u" mailbox create --no-userdb-lookup -- "$m"
     fi
 
     # EXPUNGE some messages
     u="$(shuf -n1 -e -- "${TARGETS[@]}")" # choose target at random
     n="$(shuf -n1 -i0-3)"
     while read guid uid; do
-        doveadm -u "$u" expunge mailbox-guid "$guid" uid "$uid"
-    done < <(doveadm -u "$u" search all | shuf -n "$n")
+        doveadm -u "$u" expunge --no-userdb-lookup mailbox-guid "$guid" uid "$uid"
+    done < <(doveadm -u "$u" search --no-userdb-lookup all | shuf -n "$n")
 
     # mark some existing messages as read (toggle \Seen flag as unlike other
     # flags it's easier to query and check_mailboxes_status checks it)
@@ -65,8 +65,8 @@ while [ $(date +%s) -le $timer ]; do
     n="$(shuf -n1 -i0-9)"
     while read guid uid; do
         a="$(shuf -n1 -e add remove replace)"
-        doveadm -u "$u" flags "$a" "\\Seen" mailbox-guid "$guid" uid "$uid"
-    done < <(doveadm -u "$u" search all | shuf -n "$n")
+        doveadm -u "$u" flags "$a" --no-userdb-lookup "\\Seen" mailbox-guid "$guid" uid "$uid"
+    done < <(doveadm -u "$u" search --no-userdb-lookup all | shuf -n "$n")
 
     # select at random a mailbox where to deliver some messages
     u="$(shuf -n1 -e "local" "remote")" # choose target at random
@@ -103,14 +103,14 @@ trap - EXIT INT TERM
 
 # check that the mailbox lists match
 diff -u --label="local/mailboxes" --label="remote1/mailboxes" \
-    <( doveadm -u "local"   mailbox list | sed -n "s,^foo/,,p" | sort ) \
-    <( doveadm -u "remote1" mailbox list | tr '^' '/'          | sort )
+    <( doveadm -u "local"   mailbox list --no-userdb-lookup | sed -n "s,^foo/,,p" | sort ) \
+    <( doveadm -u "remote1" mailbox list --no-userdb-lookup | tr '^' '/'          | sort )
 diff -u --label="local/mailboxes" --label="remote2/mailboxes" \
-    <( doveadm -u "local"   mailbox list | sed -n "s,^bar/,,p" | sort ) \
-    <( doveadm -u "remote2" mailbox list | tr '\\' '/'         | sort )
+    <( doveadm -u "local"   mailbox list --no-userdb-lookup | sed -n "s,^bar/,,p" | sort ) \
+    <( doveadm -u "remote2" mailbox list --no-userdb-lookup | tr '\\' '/'         | sort )
 diff -u --label="local/mailboxes" --label="remote3/mailboxes" \
-    <( doveadm -u "local"   mailbox list | sed -n "s,^baz/,,p" | sort ) \
-    <( doveadm -u "remote3" mailbox list | tr '?' '/'          | sort )
+    <( doveadm -u "local"   mailbox list --no-userdb-lookup | sed -n "s,^baz/,,p" | sort ) \
+    <( doveadm -u "remote3" mailbox list --no-userdb-lookup | tr '?' '/'          | sort )
 
 for m in "${MAILBOXES[@]}"; do
     case "$m" in
@@ -124,4 +124,4 @@ for m in "${MAILBOXES[@]}"; do
     check_mailbox_status2 "$blob" "$m" "$u" "$mr"
 done
 
-# vim: set filetype=sh :
+# vim: set filetype=bash :