Merge branch 'master' into HEAD

3 files changed, 26 insertions, 0 deletions

diff --git a/tests/01-rename-exists-db/local.conf b/tests/01-rename-exists-db/local.conf
new file mode 100644
index 0000000..93497d9
--- /dev/null
+++ b/tests/01-rename-exists-db/local.conf
@@ -0,0 +1,6 @@
+namespace inbox {
+    separator = .
+    location  = maildir:~/inbox:LAYOUT=index
+    inbox     = yes
+    list      = yes
+}
diff --git a/tests/01-rename-exists-db/remote.conf b/tests/01-rename-exists-db/remote.conf
new file mode 100644
index 0000000..61e3d0d
--- /dev/null
+++ b/tests/01-rename-exists-db/remote.conf
@@ -0,0 +1,6 @@
+namespace inbox {
+    separator = "\\"
+    location  = maildir:~/inbox:LAYOUT=index
+    inbox     = yes
+    list      = yes
+}
diff --git a/tests/01-rename-exists-db/run b/tests/01-rename-exists-db/run
new file mode 100644
index 0000000..29cb075
--- /dev/null
+++ b/tests/01-rename-exists-db/run
@@ -0,0 +1,14 @@
+doveadm -u "local"  mailbox create "root.from" "root.from.child" "t.o"
+doveadm -u "remote" mailbox create "root\\from" "root\\from\\child" "t\\o"
+
+interimap
+check_mailbox_list
+
+# delete a mailbox on both servers but leave it in the database, then try to use it as target for --rename
+doveadm -u "local"  mailbox delete "t.o"
+doveadm -u "remote" mailbox delete "t\\o"
+
+! interimap --rename "root.from" "t.o"
+xgrep -Fx 'database: ERROR: Mailbox t.o exists.  Run `interimap --target=database --delete t.o` to delete.' <"$STDERR"
+
+# vim: set filetype=sh :