test: make it possible to have multiple corpora

We largely use the corpus under test/corpus for
testing. Unfortunately, many of our tests have grown to depend on
having exactly this set of messages, making it hard to add new message
files for testing specific cases.

We do use a lot of add_message from within the tests, but it's not
possible to use that for adding broken messages, and adding several
messages at once can get unwieldy.

Move the basic corpus under tests/corpora/default, and make it
possible to add new, independent corpora along its side. This means
tons of renames with a few tweaks to add_email_corpus function in
test-lib.sh to let tests specify which corpus to use.

54 files changed, 12 insertions, 7 deletions

diff --git a/test/corpus/01:2, b/test/corpora/default/01:2,
index 7e9e3490..7e9e3490 100644
--- a/test/corpus/01:2,
+++ b/test/corpora/default/01:2,
diff --git a/test/corpus/02:2, b/test/corpora/default/02:2,
index dadcdaac..dadcdaac 100644
--- a/test/corpus/02:2,
+++ b/test/corpora/default/02:2,
diff --git a/test/corpus/bar/17:2, b/test/corpora/default/bar/17:2,
index d3b75685..d3b75685 100644
--- a/test/corpus/bar/17:2,
+++ b/test/corpora/default/bar/17:2,
diff --git a/test/corpus/bar/18:2, b/test/corpora/default/bar/18:2,
index f522f69e..f522f69e 100644
--- a/test/corpus/bar/18:2,
+++ b/test/corpora/default/bar/18:2,
diff --git a/test/corpus/bar/baz/05:2, b/test/corpora/default/bar/baz/05:2,
index 75b05fa4..75b05fa4 100644
--- a/test/corpus/bar/baz/05:2,
+++ b/test/corpora/default/bar/baz/05:2,
diff --git a/test/corpus/bar/baz/23:2, b/test/corpora/default/bar/baz/23:2,
index 9bb62d73..9bb62d73 100644
--- a/test/corpus/bar/baz/23:2,
+++ b/test/corpora/default/bar/baz/23:2,
diff --git a/test/corpus/bar/baz/24:2, b/test/corpora/default/bar/baz/24:2,
index c8000207..c8000207 100644
--- a/test/corpus/bar/baz/24:2,
+++ b/test/corpora/default/bar/baz/24:2,
diff --git a/test/corpus/bar/baz/cur/25:2, b/test/corpora/default/bar/baz/cur/25:2,
index 7378f820..7378f820 100644
--- a/test/corpus/bar/baz/cur/25:2,
+++ b/test/corpora/default/bar/baz/cur/25:2,
diff --git a/test/corpus/bar/baz/cur/26:2, b/test/corpora/default/bar/baz/cur/26:2,
index f3c5f53d..f3c5f53d 100644
--- a/test/corpus/bar/baz/cur/26:2,
+++ b/test/corpora/default/bar/baz/cur/26:2,
diff --git a/test/corpus/bar/baz/new/27:2, b/test/corpora/default/bar/baz/new/27:2,
index 7f0f045b..7f0f045b 100644
--- a/test/corpus/bar/baz/new/27:2,
+++ b/test/corpora/default/bar/baz/new/27:2,
diff --git a/test/corpus/bar/baz/new/28:2, b/test/corpora/default/bar/baz/new/28:2,
index 83ce01bd..83ce01bd 100644
--- a/test/corpus/bar/baz/new/28:2,
+++ b/test/corpora/default/bar/baz/new/28:2,
diff --git a/test/corpus/bar/cur/19:2, b/test/corpora/default/bar/cur/19:2,
index 1b7872b0..1b7872b0 100644
--- a/test/corpus/bar/cur/19:2,
+++ b/test/corpora/default/bar/cur/19:2,
diff --git a/test/corpus/bar/cur/20:2, b/test/corpora/default/bar/cur/20:2,
index f08a3145..f08a3145 100644
--- a/test/corpus/bar/cur/20:2,
+++ b/test/corpora/default/bar/cur/20:2,
diff --git a/test/corpus/bar/new/21:2, b/test/corpora/default/bar/new/21:2,
index 7ff55ccf..7ff55ccf 100644
--- a/test/corpus/bar/new/21:2,
+++ b/test/corpora/default/bar/new/21:2,
diff --git a/test/corpus/bar/new/22:2, b/test/corpora/default/bar/new/22:2,
index 08adada6..08adada6 100644
--- a/test/corpus/bar/new/22:2,
+++ b/test/corpora/default/bar/new/22:2,
diff --git a/test/corpus/cur/29:2, b/test/corpora/default/cur/29:2,
index c76eff33..c76eff33 100644
--- a/test/corpus/cur/29:2,
+++ b/test/corpora/default/cur/29:2,
diff --git a/test/corpus/cur/30:2, b/test/corpora/default/cur/30:2,
index a5b94a0a..a5b94a0a 100644
--- a/test/corpus/cur/30:2,
+++ b/test/corpora/default/cur/30:2,
diff --git a/test/corpus/cur/31:2, b/test/corpora/default/cur/31:2,
index 88f17ca9..88f17ca9 100644
--- a/test/corpus/cur/31:2,
+++ b/test/corpora/default/cur/31:2,
diff --git a/test/corpus/cur/32:2, b/test/corpora/default/cur/32:2,
index c1633cdd..c1633cdd 100644
--- a/test/corpus/cur/32:2,
+++ b/test/corpora/default/cur/32:2,
diff --git a/test/corpus/cur/33:2, b/test/corpora/default/cur/33:2,
index a9b32524..a9b32524 100644
--- a/test/corpus/cur/33:2,
+++ b/test/corpora/default/cur/33:2,
diff --git a/test/corpus/cur/34:2, b/test/corpora/default/cur/34:2,
index b94dd069..b94dd069 100644
--- a/test/corpus/cur/34:2,
+++ b/test/corpora/default/cur/34:2,
diff --git a/test/corpus/cur/35:2, b/test/corpora/default/cur/35:2,
index d7276705..d7276705 100644
--- a/test/corpus/cur/35:2,
+++ b/test/corpora/default/cur/35:2,
diff --git a/test/corpus/cur/36:2, b/test/corpora/default/cur/36:2,
index 4cd0d200..4cd0d200 100644
--- a/test/corpus/cur/36:2,
+++ b/test/corpora/default/cur/36:2,
diff --git a/test/corpus/cur/37:2, b/test/corpora/default/cur/37:2,
index 4e17e82b..4e17e82b 100644
--- a/test/corpus/cur/37:2,
+++ b/test/corpora/default/cur/37:2,
diff --git a/test/corpus/cur/38:2, b/test/corpora/default/cur/38:2,
index f5537ffe..f5537ffe 100644
--- a/test/corpus/cur/38:2,
+++ b/test/corpora/default/cur/38:2,
diff --git a/test/corpus/cur/39:2, b/test/corpora/default/cur/39:2,
index 637b3c74..637b3c74 100644
--- a/test/corpus/cur/39:2,
+++ b/test/corpora/default/cur/39:2,
diff --git a/test/corpus/cur/40:2, b/test/corpora/default/cur/40:2,
index 91a15a8d..91a15a8d 100644
--- a/test/corpus/cur/40:2,
+++ b/test/corpora/default/cur/40:2,
diff --git a/test/corpus/cur/41:2, b/test/corpora/default/cur/41:2,
index da22cc02..da22cc02 100644
--- a/test/corpus/cur/41:2,
+++ b/test/corpora/default/cur/41:2,
diff --git a/test/corpus/cur/42:2, b/test/corpora/default/cur/42:2,
index 98fa75fa..98fa75fa 100644
--- a/test/corpus/cur/42:2,
+++ b/test/corpora/default/cur/42:2,
diff --git a/test/corpus/cur/43:2, b/test/corpora/default/cur/43:2,
index 2f6c8bc8..2f6c8bc8 100644
--- a/test/corpus/cur/43:2,
+++ b/test/corpora/default/cur/43:2,
diff --git a/test/corpus/cur/44:2, b/test/corpora/default/cur/44:2,
index c896c189..c896c189 100644
--- a/test/corpus/cur/44:2,
+++ b/test/corpora/default/cur/44:2,
diff --git a/test/corpus/cur/45:2, b/test/corpora/default/cur/45:2,
index 806b0e89..806b0e89 100644
--- a/test/corpus/cur/45:2,
+++ b/test/corpora/default/cur/45:2,
diff --git a/test/corpus/cur/46:2, b/test/corpora/default/cur/46:2,
index bbd1b37f..bbd1b37f 100644
--- a/test/corpus/cur/46:2,
+++ b/test/corpora/default/cur/46:2,
diff --git a/test/corpus/cur/47:2, b/test/corpora/default/cur/47:2,
index 9de5532c..9de5532c 100644
--- a/test/corpus/cur/47:2,
+++ b/test/corpora/default/cur/47:2,
diff --git a/test/corpus/cur/48:2, b/test/corpora/default/cur/48:2,
index 419e21db..419e21db 100644
--- a/test/corpus/cur/48:2,
+++ b/test/corpora/default/cur/48:2,
diff --git a/test/corpus/cur/49:2, b/test/corpora/default/cur/49:2,
index b244f8ce..b244f8ce 100644
--- a/test/corpus/cur/49:2,
+++ b/test/corpora/default/cur/49:2,
diff --git a/test/corpus/cur/50:2, b/test/corpora/default/cur/50:2,
index 44e8be5d..44e8be5d 100644
--- a/test/corpus/cur/50:2,
+++ b/test/corpora/default/cur/50:2,
diff --git a/test/corpus/cur/51:2, b/test/corpora/default/cur/51:2,
index f522f69e..f522f69e 100644
--- a/test/corpus/cur/51:2,
+++ b/test/corpora/default/cur/51:2,
diff --git a/test/corpus/cur/52:2, b/test/corpora/default/cur/52:2,
index 60283404..60283404 100644
--- a/test/corpus/cur/52:2,
+++ b/test/corpora/default/cur/52:2,
diff --git a/test/corpus/cur/53:2, b/test/corpora/default/cur/53:2,
index 7a1e2e58..7a1e2e58 100644
--- a/test/corpus/cur/53:2,
+++ b/test/corpora/default/cur/53:2,
diff --git a/test/corpus/foo/06:2, b/test/corpora/default/foo/06:2,
index 3baad491..3baad491 100644
--- a/test/corpus/foo/06:2,
+++ b/test/corpora/default/foo/06:2,
diff --git a/test/corpus/foo/baz/11:2, b/test/corpora/default/foo/baz/11:2,
index c0701def..c0701def 100644
--- a/test/corpus/foo/baz/11:2,
+++ b/test/corpora/default/foo/baz/11:2,
diff --git a/test/corpus/foo/baz/12:2, b/test/corpora/default/foo/baz/12:2,
index fbc604c0..fbc604c0 100644
--- a/test/corpus/foo/baz/12:2,
+++ b/test/corpora/default/foo/baz/12:2,
diff --git a/test/corpus/foo/baz/cur/13:2, b/test/corpora/default/foo/baz/cur/13:2,
index 03cb3744..03cb3744 100644
--- a/test/corpus/foo/baz/cur/13:2,
+++ b/test/corpora/default/foo/baz/cur/13:2,
diff --git a/test/corpus/foo/baz/cur/14:2, b/test/corpora/default/foo/baz/cur/14:2,
index d3fe78db..d3fe78db 100644
--- a/test/corpus/foo/baz/cur/14:2,
+++ b/test/corpora/default/foo/baz/cur/14:2,
diff --git a/test/corpus/foo/baz/new/15:2, b/test/corpora/default/foo/baz/new/15:2,
index 6824d5ea..6824d5ea 100644
--- a/test/corpus/foo/baz/new/15:2,
+++ b/test/corpora/default/foo/baz/new/15:2,
diff --git a/test/corpus/foo/baz/new/16:2, b/test/corpora/default/foo/baz/new/16:2,
index f531eb93..f531eb93 100644
--- a/test/corpus/foo/baz/new/16:2,
+++ b/test/corpora/default/foo/baz/new/16:2,
diff --git a/test/corpus/foo/cur/07:2, b/test/corpora/default/foo/cur/07:2,
index 7b1e2bbe..7b1e2bbe 100644
--- a/test/corpus/foo/cur/07:2,
+++ b/test/corpora/default/foo/cur/07:2,
diff --git a/test/corpus/foo/cur/08:2, b/test/corpora/default/foo/cur/08:2,
index baf34d1f..baf34d1f 100644
--- a/test/corpus/foo/cur/08:2,
+++ b/test/corpora/default/foo/cur/08:2,
diff --git a/test/corpus/foo/new/03:2, b/test/corpora/default/foo/new/03:2,
index c154ac5e..c154ac5e 100644
--- a/test/corpus/foo/new/03:2,
+++ b/test/corpora/default/foo/new/03:2,
diff --git a/test/corpus/foo/new/09:2, b/test/corpora/default/foo/new/09:2,
index 26b51b1f..26b51b1f 100644
--- a/test/corpus/foo/new/09:2,
+++ b/test/corpora/default/foo/new/09:2,
diff --git a/test/corpus/foo/new/10:2, b/test/corpora/default/foo/new/10:2,
index 4211d734..4211d734 100644
--- a/test/corpus/foo/new/10:2,
+++ b/test/corpora/default/foo/new/10:2,
diff --git a/test/corpus/new/04:2, b/test/corpora/default/new/04:2,
index 0ce678bf..0ce678bf 100644
--- a/test/corpus/new/04:2,
+++ b/test/corpora/default/new/04:2,
diff --git a/test/test-lib.sh b/test/test-lib.sh
index aac0343b..e2e26e6f 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -541,21 +541,26 @@ emacs_fcc_message ()
     notmuch new >/dev/null
 }
 
-# Generate a corpus of email and add it to the database.
+# Add an existing, fixed corpus of email to the database.
 #
-# This corpus is fixed, (it happens to be 50 messages from early in
-# the history of the notmuch mailing list), which allows for reliably
+# $1 is the corpus dir under corpora to add, using "default" if unset.
+#
+# The default corpus is based on about 50 messages from early in the
+# history of the notmuch mailing list, which allows for reliably
 # testing commands that need to operate on a not-totally-trivial
 # number of messages.
 add_email_corpus ()
 {
+    corpus=${1:-default}
+
     rm -rf ${MAIL_DIR}
-    if [ -d $TEST_DIRECTORY/corpus.mail ]; then
-	cp -a $TEST_DIRECTORY/corpus.mail ${MAIL_DIR}
+    if [ -d $TEST_DIRECTORY/corpora.mail/$corpus ]; then
+	cp -a $TEST_DIRECTORY/corpora.mail/$corpus ${MAIL_DIR}
     else
-	cp -a $TEST_DIRECTORY/corpus ${MAIL_DIR}
+	cp -a $TEST_DIRECTORY/corpora/$corpus ${MAIL_DIR}
 	notmuch new >/dev/null || die "'notmuch new' failed while adding email corpus"
-	cp -a ${MAIL_DIR} $TEST_DIRECTORY/corpus.mail
+	mkdir -p $TEST_DIRECTORY/corpora.mail
+	cp -a ${MAIL_DIR} $TEST_DIRECTORY/corpora.mail/$corpus
     fi
 }