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 E03A7431FD0 for ; Fri, 21 Oct 2011 12:48:12 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -2.3 X-Spam-Level: X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5 tests=[RCVD_IN_DNSWL_MED=-2.3] 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 U5vkqUHZTQMq for ; Fri, 21 Oct 2011 12:48:11 -0700 (PDT) Received: from tempo.its.unb.ca (tempo.its.unb.ca [131.202.1.21]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 44D29429E26 for ; Fri, 21 Oct 2011 12:48:11 -0700 (PDT) Received: from convex-new.cs.unb.ca ([131.202.13.154]) by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id p9LJm4Ci002202; Fri, 21 Oct 2011 16:48:07 -0300 Received: from bremner by convex-new.cs.unb.ca with local (Exim 4.72) (envelope-from ) id 1RHL4W-00016T-RB; Fri, 21 Oct 2011 16:48:04 -0300 From: David Bremner To: notmuch@notmuchmail.org Subject: [PATCH 3/6] test/dump-restore: add tests for restore --accumulate Date: Fri, 21 Oct 2011 16:47:54 -0300 Message-Id: <1319226477-4181-4-git-send-email-david@tethera.net> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1319226477-4181-1-git-send-email-david@tethera.net> References: <1317317857-29636-1-git-send-email-thomas@schwinge.name> <1319226477-4181-1-git-send-email-david@tethera.net> Cc: David Bremner 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: Fri, 21 Oct 2011 19:48:13 -0000 From: David Bremner Flesh out what ``notmuch restore --accumulate'' is supposed to do. Its tests are currently XFAILed; the functionality will be added in future patch(es). Based on a patch by Thomas Schwinge: id:"1317317811-29540-1-git-send-email-thomas@schwinge.name" --- test/dump-restore | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/test/dump-restore b/test/dump-restore index 502fb82..276dd6f 100755 --- a/test/dump-restore +++ b/test/dump-restore @@ -9,12 +9,27 @@ test_expect_success 'Dumping all tags' \ notmuch new && notmuch dump > dump.expected' +# The use of from:cworth is rather arbitrary: it matches some of the +# email corpus' messages, but not all of them. + +test_expect_success 'Dumping all tags II' \ + 'notmuch tag +ABC +DEF -- from:cworth && + notmuch dump > dump-ABC_DEF.expected && + ! cmp dump.expected dump-ABC_DEF.expected' + test_expect_success 'Clearing all tags' \ 'sed -e "s/(\([^(]*\))$/()/" < dump.expected > clear.expected && notmuch restore clear.expected && notmuch dump > clear.actual && test_cmp clear.expected clear.actual' +test_subtest_known_broken # missing --accumuluate +test_expect_success 'Accumulate original tags' \ + 'notmuch tag +ABC +DEF -- from:cworth && + notmuch restore --accumulate < dump.expected && + notmuch dump > dump.actual && + test_cmp dump-ABC_DEF.expected dump.actual' + test_expect_success 'Restoring original tags' \ 'notmuch restore dump.expected && notmuch dump > dump.actual && @@ -25,6 +40,18 @@ test_expect_success 'Restore with nothing to do' \ notmuch dump > dump.actual && test_cmp dump.expected dump.actual' +test_subtest_known_broken # missing --accumuluate +test_expect_success 'Restore with nothing to do, II' \ + 'notmuch restore --accumulate dump.expected && + notmuch dump > dump.actual && + test_cmp dump.expected dump.actual' + +test_subtest_known_broken # missing --accumuluate +test_expect_success 'Restore with nothing to do, III' \ + 'notmuch restore --accumulate < clear.expected && + notmuch dump > dump.actual && + test_cmp dump.expected dump.actual' + # notmuch restore currently only considers the first argument. test_subtest_known_broken test_expect_success 'Invalid restore invocation' \ -- 1.7.5.4