Re: [PATCH 1/3] test: Add compact test

diff --git a/9d/83b5589e68909c97d1d088406cce453150bd51 b/9d/83b5589e68909c97d1d088406cce453150bd51
new file mode 100644 (file)
index 0000000..1118520
--- /dev/null
+++ b/9d/83b5589e68909c97d1d088406cce453150bd51
@@ -0,0 +1,85 @@
+Return-Path: <david@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 2A4CE431FC2\r
+       for <notmuch@notmuchmail.org>; Sun, 20 Oct 2013 05:18:19 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id 2zl1+2PhLtE2 for <notmuch@notmuchmail.org>;\r
+       Sun, 20 Oct 2013 05:18:14 -0700 (PDT)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 6B8A0431FC0\r
+       for <notmuch@notmuchmail.org>; Sun, 20 Oct 2013 05:18:14 -0700 (PDT)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <david@tethera.net>)\r
+       id 1VXrxR-0006WF-FA; Sun, 20 Oct 2013 09:18:09 -0300\r
+Received: (nullmailer pid 23056 invoked by uid 1000); Sun, 20 Oct 2013\r
+       12:18:05 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: Ben Gamari <bgamari.foss@gmail.com>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 1/3] test: Add compact test\r
+In-Reply-To: <1381799585-16274-2-git-send-email-bgamari.foss@gmail.com>\r
+References: <1381799585-16274-1-git-send-email-bgamari.foss@gmail.com>\r
+       <1381799585-16274-2-git-send-email-bgamari.foss@gmail.com>\r
+User-Agent: Notmuch/0.16+97~g6878b0b (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Sun, 20 Oct 2013 09:18:05 -0300\r
+Message-ID: <874n8cw2yq.fsf@zancas.localnet>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 20 Oct 2013 12:18:19 -0000\r
+\r
+\r
+Hi Ben;\r
+\r
+Thanks for writing these tests. I have some proposed changes. I didn't\r
+understand why you called notmuch search twice, and for whatever reason\r
+test_begin_subtest doesn't pair up with test_expect_success\r
+\r
+diff --git a/test/compact b/test/compact\r
+index 54e85ab..5bb5cea 100755\r
+--- a/test/compact\r
++++ b/test/compact\r
+@@ -10,11 +10,9 @@ notmuch tag +tag1 \*\r
+ notmuch tag +tag2 subject:Two\r
+ notmuch tag -tag1 +tag3 subject:Three\r
+ \r
+-test_begin_subtest "Compacting"\r
+-notmuch compact\r
+-test_expect_success "compact" "notmuch compact"\r
++test_expect_success "Running compact" "notmuch compact"\r
+ \r
+-notmuch search \*\r
++test_begin_subtest "Compact preserves database"\r
+ output=$(notmuch search \* | notmuch_search_sanitize)\r
+ test_expect_equal "$output" "\\r
+ thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; One (inbox tag1 unread)\r
+@@ -25,7 +23,6 @@ test_begin_subtest "Restoring backup"\r
+ rm -Rf ${TEST_TMPDIR}/mail/xapian\r
+ mv ${TEST_TMPDIR}/mail/xapian.old ${TEST_TMPDIR}/mail/xapian\r
+ \r
+-notmuch search \*\r
+ output=$(notmuch search \* | notmuch_search_sanitize)\r
+ test_expect_equal "$output" "\\r
+ thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; One (inbox tag1 unread)\r