Merge branch 'master' into HEAD

3 files changed, 35 insertions, 0 deletions

diff --git a/tests/00-db-exclusive/local.conf b/tests/00-db-exclusive/local.conf
new file mode 100644
index 0000000..9c838fd
--- /dev/null
+++ b/tests/00-db-exclusive/local.conf
@@ -0,0 +1,5 @@
+namespace inbox {
+    location  = maildir:~/inbox:LAYOUT=index
+    inbox     = yes
+    list      = yes
+}
diff --git a/tests/00-db-exclusive/remote.conf b/tests/00-db-exclusive/remote.conf
new file mode 100644
index 0000000..9c838fd
--- /dev/null
+++ b/tests/00-db-exclusive/remote.conf
@@ -0,0 +1,5 @@
+namespace inbox {
+    location  = maildir:~/inbox:LAYOUT=index
+    inbox     = yes
+    list      = yes
+}
diff --git a/tests/00-db-exclusive/run b/tests/00-db-exclusive/run
new file mode 100644
index 0000000..1ae27b6
--- /dev/null
+++ b/tests/00-db-exclusive/run
@@ -0,0 +1,25 @@
+# verify that database isn't created in --watch mode
+! interimap --watch=60
+xgrep -E "^DBI connect\(.*\) failed: unable to open database file at " <"$STDERR"
+
+# now create database
+interimap
+
+# start a background process
+interimap --watch=60 & pid=$!
+cleanup() {
+    # kill interimap process and its children
+    pkill -P "$pid" -TERM
+    kill -TERM "$pid"
+    wait
+}
+trap cleanup EXIT INT TERM
+
+sleep .05 # wait a short while so we have time to lock the database (ugly and racy...)
+# verify that subsequent runs fail as we can't acquire the exclusive lock
+! interimap
+
+# line 177 is `$DBH->do("PRAGMA locking_mode = EXCLUSIVE");`
+xgrep -Fx "DBD::SQLite::db do failed: database is locked at ./interimap line 177." <"$STDERR"
+
+# vim: set filetype=sh :