Merge tag 'v0.5.8' into debian/latest

Release version 0.5.8

1 files changed, 11 insertions, 11 deletions

diff --git a/tests/sync-mailbox-list/t b/tests/sync-mailbox-list/t
index ea80fbf..ba533f0 100644
--- a/tests/sync-mailbox-list/t
+++ b/tests/sync-mailbox-list/t
@@ -4,10 +4,10 @@
 #  baz: present on both, subscribed to remote only
 #  foo.bar: present on local only
 #  foo.baz: present on remote only
-doveadm -u "local"  mailbox create    "foo" "bar" "baz" "foo.bar" "fo!o [b*a%r]"
-doveadm -u "local"  mailbox subscribe "foo" "bar"
-doveadm -u "remote" mailbox create    "foo" "bar" "baz" "foo~baz" "foo]bar"
-doveadm -u "remote" mailbox subscribe "foo" "baz"
+doveadm -u "local"  mailbox create --no-userdb-lookup    "foo" "bar" "baz" "foo.bar" "fo!o [b*a%r]"
+doveadm -u "local"  mailbox subscribe --no-userdb-lookup "foo" "bar"
+doveadm -u "remote" mailbox create --no-userdb-lookup    "foo" "bar" "baz" "foo~baz" "foo]bar"
+doveadm -u "remote" mailbox subscribe --no-userdb-lookup "foo" "baz"
 
 populate() {
     local i
@@ -45,7 +45,7 @@ step_start "aborts if present in database"
 for u in "local" "remote"; do
     [ "$u" = "local" ] && { m="foo.bar"; m2="$m"; } || { m="foo.baz"; m2="foo~baz"; }
 
-    doveadm -u "$u" mailbox delete "$m2"
+    doveadm -u "$u" mailbox delete --no-userdb-lookup "$m2"
     ! interimap || error
     grep -Fx "database: ERROR: Mailbox $m exists. Run \`interimap --target=database --delete $m\` to delete." <"$STDERR"
 
@@ -64,10 +64,10 @@ step_done
 
 # (un)subscribe from some mailboxes, including a non-existent one
 step_start "new (un)subscribtions"
-doveadm -u "local"  mailbox unsubscribe "foo"
-doveadm -u "remote" mailbox unsubscribe "bar"
-doveadm -u "local"  mailbox subscribe "foo.bar" "foo.nonexistent" "foo.baz"
-doveadm -u "remote" mailbox subscribe "foo~bar" "bar~nonexistent"
+doveadm -u "local"  mailbox unsubscribe --no-userdb-lookup "foo"
+doveadm -u "remote" mailbox unsubscribe --no-userdb-lookup "bar"
+doveadm -u "local"  mailbox subscribe --no-userdb-lookup "foo.bar" "foo.nonexistent" "foo.baz"
+doveadm -u "remote" mailbox subscribe --no-userdb-lookup "foo~bar" "bar~nonexistent"
 populate
 
 interimap
@@ -75,7 +75,7 @@ grep -Fx "remote: Unsubscribe to foo"   <"$STDERR"
 grep -Fx "local: Unsubscribe to bar"    <"$STDERR"
 grep -Fx "remote: Subscribe to foo~baz" <"$STDERR"
 verify
-check_mailbox_list -s $(doveadm -u "local" mailbox list) # exclude "foo.nonexistent" and "bar~nonexistent"
+check_mailbox_list -s $(doveadm -u "local" mailbox list --no-userdb-lookup) # exclude "foo.nonexistent" and "bar~nonexistent"
 
 # check that "baz", "foo.bar" and "foo.baz" are the only subscribed mailboxes
 sqlite3 "$XDG_DATA_HOME/interimap/remote.db" >"$TMPDIR/count" <<-EOF
@@ -90,4 +90,4 @@ EOF
 [ $(< "$TMPDIR/count") -eq 0 ] || error
 step_done
 
-# vim: set filetype=sh :
+# vim: set filetype=bash :