From e2c419c9e75c834531090e2b6c231cbbd252a932 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Tue, 29 Oct 2013 18:23:14 +2000 Subject: [PATCH] [PATCH 1/4] test: Add compact test --- 3c/0d870809fcf55ad9cbb8da9d1fc4566e77edcd | 124 ++++++++++++++++++++++ 1 file changed, 124 insertions(+) create mode 100644 3c/0d870809fcf55ad9cbb8da9d1fc4566e77edcd diff --git a/3c/0d870809fcf55ad9cbb8da9d1fc4566e77edcd b/3c/0d870809fcf55ad9cbb8da9d1fc4566e77edcd new file mode 100644 index 000000000..7acba9d3c --- /dev/null +++ b/3c/0d870809fcf55ad9cbb8da9d1fc4566e77edcd @@ -0,0 +1,124 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 18123431FDA + for ; Mon, 28 Oct 2013 15:23:33 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.799 +X-Spam-Level: +X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id N9MQZe0z2BYa for ; + Mon, 28 Oct 2013 15:23:28 -0700 (PDT) +Received: from mail-qa0-f50.google.com (mail-qa0-f50.google.com + [209.85.216.50]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 0628B431FAF + for ; Mon, 28 Oct 2013 15:23:27 -0700 (PDT) +Received: by mail-qa0-f50.google.com with SMTP id cm18so2505009qab.9 + for ; Mon, 28 Oct 2013 15:23:27 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=from:to:cc:subject:date:message-id; + bh=AGdUOLDlmRscfTbD7v1hQxh0Ss9J0Kiu5LV2eJ7vLrU=; + b=ocNeCc7npJ2EWUa7pXP9V5bxT/b9kvMKCo8XczMhwt8RDo22s3tRoom8J23Rc4Gkl4 + M1QNG5k9ZBdjs64MHeKYIUA9G+kY0pZVS18vtasv4gaVDL62sv9+C3OZquC/14R0noYu + kj1c9/c4Uvs0G20FXWReOu05r1sxrcawtEVIXWKWJtfv2TSWkoRUiqsYA4I/FckbJu1G + jdjSTvwDo8BC2DarpPkD4yu0Bp0n7BsUzxwlRrBQXolv+6vjdVYC8QCYUprb/ohlonOf + gxX2M+yjABoL/AmXVD6xUykTWDzviSyjOd27l6cu2OdahBUeWFiajOLFYu+299oVSoo8 + snHQ== +X-Received: by 10.224.54.209 with SMTP id r17mr33243454qag.16.1382999007564; + Mon, 28 Oct 2013 15:23:27 -0700 (PDT) +Received: from ben-laptop.hasb.physics.cns (physicsnat56.physics.umass.edu. + [128.119.50.38]) + by mx.google.com with ESMTPSA id x1sm57796293qai.6.2013.10.28.15.23.26 + for + (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); + Mon, 28 Oct 2013 15:23:27 -0700 (PDT) +From: Ben Gamari +To: notmuch@notmuchmail.org +Subject: [PATCH 1/4] test: Add compact test +Date: Mon, 28 Oct 2013 18:23:14 -0400 +Message-Id: <1382998997-9938-1-git-send-email-bgamari.foss@gmail.com> +X-Mailer: git-send-email 1.8.3.2 +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Mon, 28 Oct 2013 22:23:33 -0000 + +Signed-off-by: Ben Gamari +--- + test/compact | 35 +++++++++++++++++++++++++++++++++++ + test/notmuch-test | 1 + + 2 files changed, 36 insertions(+) + create mode 100755 test/compact + +diff --git a/test/compact b/test/compact +new file mode 100755 +index 0000000..54e85ab +--- /dev/null ++++ b/test/compact +@@ -0,0 +1,35 @@ ++#!/usr/bin/env bash ++test_description='"notmuch compact"' ++. ./test-lib.sh ++ ++add_message '[subject]=One' ++add_message '[subject]=Two' ++add_message '[subject]=Three' ++ ++notmuch tag +tag1 \* ++notmuch tag +tag2 subject:Two ++notmuch tag -tag1 +tag3 subject:Three ++ ++test_begin_subtest "Compacting" ++notmuch compact ++test_expect_success "compact" "notmuch compact" ++ ++notmuch search \* ++output=$(notmuch search \* | notmuch_search_sanitize) ++test_expect_equal "$output" "\ ++thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; One (inbox tag1 unread) ++thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Two (inbox tag1 tag2 unread) ++thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Three (inbox tag3 unread)" ++ ++test_begin_subtest "Restoring backup" ++rm -Rf ${TEST_TMPDIR}/mail/xapian ++mv ${TEST_TMPDIR}/mail/xapian.old ${TEST_TMPDIR}/mail/xapian ++ ++notmuch search \* ++output=$(notmuch search \* | notmuch_search_sanitize) ++test_expect_equal "$output" "\ ++thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; One (inbox tag1 unread) ++thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Two (inbox tag1 tag2 unread) ++thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Three (inbox tag3 unread)" ++ ++test_done +diff --git a/test/notmuch-test b/test/notmuch-test +index aa28bb0..ec94baf 100755 +--- a/test/notmuch-test ++++ b/test/notmuch-test +@@ -19,6 +19,7 @@ cd $(dirname "$0") + TESTS=" + basic + help-test ++ compact + config + setup + new +-- +1.8.3.2 + -- 2.26.2