diff options
author | Jani Nikula <jani@nikula.org> | 2014-03-09 14:25:37 +0200 |
---|---|---|
committer | David Bremner <david@tethera.net> | 2014-03-11 19:50:12 -0300 |
commit | ded713c39d8b0221a3b1b2b52a74966c20c3aba8 (patch) | |
tree | 018da27a979738c09760b5fbbda3253cc5ff998f /test/corpus/bar/new | |
parent | 7630f300ba52f4aab22ee696fe1507d0ef9790bc (diff) |
test: rearrange the test corpus into subfolders, fix tests
We will need this for improved folder search tests, but having some
folders should exercise our code paths better anyway.
Modify the relevant test accordingly to make it pass.
This reorganization triggers a bug in the test suite, namely that it
expects the output of --output=files to be in a certain order. So we
add the fix for that into the same commit.
This mainly involves sorting, although the case --duplicate=$n
requires more subtlety.
Diffstat (limited to 'test/corpus/bar/new')
-rw-r--r-- | test/corpus/bar/new/21:2, | 102 | ||||
-rw-r--r-- | test/corpus/bar/new/22:2, | 84 |
2 files changed, 186 insertions, 0 deletions
diff --git a/test/corpus/bar/new/21:2, b/test/corpus/bar/new/21:2, new file mode 100644 index 00000000..7ff55ccf --- /dev/null +++ b/test/corpus/bar/new/21:2, @@ -0,0 +1,102 @@ +MIME-Version: 1.0 +Date: Tue, 17 Nov 2009 16:23:53 -0800 +Message-ID: <cf0c4d610911171623q3e27a0adx802e47039b57604b@mail.gmail.com> +From: Alex Botero-Lowry <alex.boterolowry@gmail.com> +To: notmuch@notmuchmail.org +Content-Type: multipart/mixed; boundary=0016e64ca4d8f27a4804789a4139 +Subject: [notmuch] [PATCH] Error out if no query is supplied to search + instead of going into an infinite loop +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.12 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + <notmuch.notmuchmail.org> +List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>, + <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe> +List-Archive: <http://notmuchmail.org/pipermail/notmuch> +List-Post: <mailto:notmuch@notmuchmail.org> +List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help> +List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>, + <mailto:notmuch-request@notmuchmail.org?subject=subscribe> +Sender: notmuch-bounces@notmuchmail.org +Errors-To: notmuch-bounces@notmuchmail.org + +--0016e64ca4d8f27a4804789a4139 +Content-Type: multipart/alternative; boundary=0016e64ca4d8f27a3604789a4137 + +--0016e64ca4d8f27a3604789a4137 +Content-Type: text/plain; charset=ISO-8859-1 + +In this case error out when no query is supplied. There seems to be an +infinite-loop casued by i think notmuch_query_search_threads having +an exception: + +A Xapian exception occurred: Syntax: <expression> AND <expression> +A Xapian exception occurred: Syntax: <expression> AND <expression> +A Xapian exception occurred: Syntax: <expression> AND <expression> +A Xapian exception occurred: Syntax: <expression> AND <expression> +A Xapian exception occurred: Syntax: <expression> AND <expression> +A Xapian exception occurred: Syntax: <expression> AND <expression> +A Xapian exception occurred: Syntax: <expression> AND <expression> +A Xapian exception occurred: Syntax: <expression> AND <expression> +A Xapian exception occurred: Syntax: <expression> AND <expression> +A Xapian exception occurred: Syntax: <expression> AND <expression> +A Xapian exception occurred: Syntax: <expression> AND <expression> +A Xapian exception occurred: Syntax: <expression> AND <expression> +A Xapian exception occurred: Syntax: <expression> AND <expression> +A Xapian exception occurred: Syntax: <expression> AND <expression> +A Xapian exception occurred: Syntax: <expression> AND <expression> + +I'll look into that bug specifically a bit later. + +It might be better to do a usage instead of just throwing an error here? + +alex + +--0016e64ca4d8f27a3604789a4137 +Content-Type: text/html; charset=ISO-8859-1 + +In this case error out when no query is supplied. There seems to be an infinite-loop casued by i think notmuch_query_search_threads having<br>an exception:<br><br>A Xapian exception occurred: Syntax: <expression> AND <expression><br> +A Xapian exception occurred: Syntax: <expression> AND <expression><br>A Xapian exception occurred: Syntax: <expression> AND <expression><br>A Xapian exception occurred: Syntax: <expression> AND <expression><br> +A Xapian exception occurred: Syntax: <expression> AND <expression><br>A Xapian exception occurred: Syntax: <expression> AND <expression><br>A Xapian exception occurred: Syntax: <expression> AND <expression><br> +A Xapian exception occurred: Syntax: <expression> AND <expression><br>A Xapian exception occurred: Syntax: <expression> AND <expression><br>A Xapian exception occurred: Syntax: <expression> AND <expression><br> +A Xapian exception occurred: Syntax: <expression> AND <expression><br>A Xapian exception occurred: Syntax: <expression> AND <expression><br>A Xapian exception occurred: Syntax: <expression> AND <expression><br> +A Xapian exception occurred: Syntax: <expression> AND <expression><br>A Xapian exception occurred: Syntax: <expression> AND <expression><br><br>I'll look into that bug specifically a bit later.<br> +<br>It might be better to do a usage instead of just throwing an error here?<br><br>alex<br> + +--0016e64ca4d8f27a3604789a4137-- +--0016e64ca4d8f27a4804789a4139 +Content-Type: application/octet-stream; + name="0001-Error-out-if-no-query-is-supplied-to-search-instead-.patch" +Content-Disposition: attachment; + filename="0001-Error-out-if-no-query-is-supplied-to-search-instead-.patch" +Content-Transfer-Encoding: base64 +X-Attachment-Id: f_g25cms190 + +RnJvbSAzZjk0MzFmNzRhNWZmNjZjODRjODY5YTNlMjZjMmJhZDQyYmVkMWIxIE1vbiBTZXAgMTcg +MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGV4YW5kZXIgQm90ZXJvLUxvd3J5IDxhbGV4LmJvdGVyb2xv +d3J5QGdtYWlsLmNvbT4KRGF0ZTogVHVlLCAxNyBOb3YgMjAwOSAxNjoyMDoyOCAtMDgwMApTdWJq +ZWN0OiBbUEFUQ0hdIEVycm9yIG91dCBpZiBubyBxdWVyeSBpcyBzdXBwbGllZCB0byBzZWFyY2gg +aW5zdGVhZCBvZiBnb2luZyBpbnRvIGFuIGluZmluaXRlIGxvb3AKCi0tLQogbm90bXVjaC1zZWFy +Y2guYyB8ICAgIDUgKysrKysKIDEgZmlsZXMgY2hhbmdlZCwgNSBpbnNlcnRpb25zKCspLCAwIGRl +bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL25vdG11Y2gtc2VhcmNoLmMgYi9ub3RtdWNoLXNlYXJj +aC5jCmluZGV4IDhkYjA5YzcuLmQ5NGZjY2QgMTAwNjQ0Ci0tLSBhL25vdG11Y2gtc2VhcmNoLmMK +KysrIGIvbm90bXVjaC1zZWFyY2guYwpAQCAtNjYsNiArNjYsMTEgQEAgbm90bXVjaF9zZWFyY2hf +Y29tbWFuZCAodm9pZCAqY3R4LCBpbnQgYXJnYywgY2hhciAqYXJndltdKQogICAgIGFyZ2MgLT0g +aTsKICAgICBhcmd2ICs9IGk7CiAKKyAgICBpZiAoYXJnYyA9PSAwKSB7CisgICAgICAgIGZwcmlu +dGYgKHN0ZGVyciwgIk5vIHF1ZXJ5IHByb3ZpZGVkXG4iKTsKKyAgICAgICAgcmV0dXJuIDE7Cisg +ICAgfQorCiAgICAgY29uZmlnID0gbm90bXVjaF9jb25maWdfb3BlbiAoY3R4LCBOVUxMLCBOVUxM +KTsKICAgICBpZiAoY29uZmlnID09IE5VTEwpCiAJcmV0dXJuIDE7Ci0tIAoxLjYuNS4yCgo= +--0016e64ca4d8f27a4804789a4139 +Content-Type: text/plain; charset="us-ascii" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Content-Disposition: inline + +_______________________________________________ +notmuch mailing list +notmuch@notmuchmail.org +http://notmuchmail.org/mailman/listinfo/notmuch + +--0016e64ca4d8f27a4804789a4139-- + diff --git a/test/corpus/bar/new/22:2, b/test/corpus/bar/new/22:2, new file mode 100644 index 00000000..08adada6 --- /dev/null +++ b/test/corpus/bar/new/22:2, @@ -0,0 +1,84 @@ +Date: Tue, 17 Nov 2009 19:50:40 -0500 +From: Lars Kellogg-Stedman <lars@seas.harvard.edu> +To: Keith Packard <keithp@keithp.com> +Message-ID: <20091118005040.GA25380@dottiness.seas.harvard.edu> +References: <20091117190054.GU3165@dottiness.seas.harvard.edu> + <87iqd9rn3l.fsf@vertex.dottedmag> + <20091117203301.GV3165@dottiness.seas.harvard.edu> + <yunaayketfm.fsf@aiko.keithp.com> +MIME-Version: 1.0 +In-Reply-To: <yunaayketfm.fsf@aiko.keithp.com> +User-Agent: Mutt/1.5.19 (2009-01-05) +Cc: notmuch@notmuchmail.org +Subject: Re: [notmuch] Working with Maildir storage? +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.12 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + <notmuch.notmuchmail.org> +List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>, + <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe> +List-Archive: <http://notmuchmail.org/pipermail/notmuch> +List-Post: <mailto:notmuch@notmuchmail.org> +List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help> +List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>, + <mailto:notmuch-request@notmuchmail.org?subject=subscribe> +Content-Type: multipart/mixed; boundary="===============1483126515==" +Sender: notmuch-bounces@notmuchmail.org +Errors-To: notmuch-bounces@notmuchmail.org + + +--===============1483126515== +Content-Type: multipart/signed; micalg=pgp-sha256; + protocol="application/pgp-signature"; boundary="9amGYk9869ThD9tj" +Content-Disposition: inline + + +--9amGYk9869ThD9tj +Content-Type: text/plain; charset=us-ascii +Content-Disposition: inline +Content-Transfer-Encoding: quoted-printable + +> I've also pushed a slightly more complicated (and complete) fix to my +> private notmuch repository + +The version of lib/messages.cc in your repo doesn't build because it's +missing "#include <stdint.h>" (for the uint32_t on line 466). + +--=20 +Lars Kellogg-Stedman <lars@seas.harvard.edu> +Senior Technologist, Computing and Information Technology +Harvard University School of Engineering and Applied Sciences + + +--9amGYk9869ThD9tj +Content-Type: application/pgp-signature +Content-Disposition: inline + +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iQEcBAEBCAAGBQJLA0TgAAoJENdGlQYxQazYsG0IAJ1t9h4Q3ma8z8ejeKR22Xh0 +WcuRX2x9yEXy/+aG9W7Mot0mqUQCiLdmHM/2h5N9BFHyJvfOUf8lmssrJ5OS/kp5 +j7FIx3GUELBmEZqFUPjRSQPk1hZURYdRsloKkrbQ2kAivjjb50zAAQ8Av4Cgj6cS +3HvNNmeVfJt1NS75vm+/wn48M8Vrcdv4gvNlSOhgFOixknvRoxSyNDOHYBKvHnSV +2HnO0GzhAQzDZAwdHBzJtb8vRmglrH33TVdrE7OW+sojYB3Wyz8r9+HIt8Q8ovzX +nQ8p0Nf5DlF7tye3JYo0EeNm5EQJ4q0YyVYInhmtpi3A5Cyu50GcB/GZ5Sd6ajo= +=WULe +-----END PGP SIGNATURE----- + +--9amGYk9869ThD9tj-- + +--===============1483126515== +Content-Type: text/plain; charset="us-ascii" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Content-Disposition: inline + +_______________________________________________ +notmuch mailing list +notmuch@notmuchmail.org +http://notmuchmail.org/mailman/listinfo/notmuch + +--===============1483126515==-- + |