Refactor and improve test suite.

1 files changed, 3 insertions, 2 deletions

diff --git a/interimap b/interimap
index f170ded..a409c65 100755
--- a/interimap
+++ b/interimap
@@ -396,7 +396,7 @@ fail(undef, "Local and remote namespaces are neither both flat nor both hierarch
             fail(undef, "Local and remote hierachy delimiters differ ",
                     "(local ", print_delimiter($IMAP->{local}->{delimiter}), ", ",
                     "remote ", print_delimiter($IMAP->{remote}->{delimiter}), "), ",
-                    "refusing to update \`mailboxes\` table.")
+                    "refusing to update table \`mailboxes\`.")
                 if defined $IMAP->{local}->{delimiter} and defined $IMAP->{remote}->{delimiter}
                         # we failed earlier if only one of them was NIL
                         and $IMAP->{local}->{delimiter} ne $IMAP->{remote}->{delimiter};
@@ -418,7 +418,7 @@ fail(undef, "Local and remote namespaces are neither both flat nor both hierarch
             $DBH->do("DROP TABLE mailboxes");
             $DBH->do("ALTER TABLE _tmp${DATABASE_VERSION}_mailboxes RENAME TO mailboxes");
         }
-        fail("database", "Broken referential integrity!  Refusing to commit changes.")
+        fail("database", "Broken referential integrity! Refusing to commit changes.")
             if defined $DBH->selectrow_arrayref("PRAGMA foreign_key_check");
         SCHEMA_DONE:
         $DBH->do("PRAGMA user_version = $DATABASE_VERSION");
@@ -530,6 +530,7 @@ if (defined $COMMAND and $COMMAND eq 'delete') {
                          qw/mapping local remote mailboxes/
         if @ARGV and $CONFIG{target}->{database};
     foreach my $mailbox (@ARGV) {
+        fail(undef, "INBOX can't be deleted") if uc($mailbox) eq "INBOX"; # RFC 3501 sec. 6.3.4
         my $idx = db_get_mailbox_idx($mailbox);
 
         # delete $mailbox on servers where $mailbox exists.  note that