1 Return-Path: <bremner@tesseract.cs.unb.ca>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by arlo.cworth.org (Postfix) with ESMTP id 3B4E66DE15BE
\r
6 for <notmuch@notmuchmail.org>; Sun, 7 Jun 2015 08:06:17 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at cworth.org
\r
11 X-Spam-Status: No, score=0.215 tagged_above=-999 required=5 tests=[AWL=0.205,
\r
12 T_HEADER_FROM_DIFFERENT_DOMAINS=0.01] autolearn=disabled
\r
13 Received: from arlo.cworth.org ([127.0.0.1])
\r
14 by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id eWyP7qt5e6JP for <notmuch@notmuchmail.org>;
\r
16 Sun, 7 Jun 2015 08:06:15 -0700 (PDT)
\r
17 Received: from mx.xen14.node3324.gplhost.com (gitolite.debian.net
\r
19 by arlo.cworth.org (Postfix) with ESMTPS id 6ABE76DE1512
\r
20 for <notmuch@notmuchmail.org>; Sun, 7 Jun 2015 08:06:15 -0700 (PDT)
\r
21 Received: from remotemail by mx.xen14.node3324.gplhost.com with local (Exim
\r
22 4.80) (envelope-from <bremner@tesseract.cs.unb.ca>)
\r
23 id 1Z1c8j-0004r7-U6; Sun, 07 Jun 2015 15:05:33 +0000
\r
24 Received: (nullmailer pid 7860 invoked by uid 1000); Sun, 07 Jun 2015
\r
26 From: David Bremner <david@tethera.net>
\r
27 To: notmuch@notmuchmail.org
\r
28 Subject: [PATCH 06/10] test: move backup_database and restore_database to
\r
30 Date: Sun, 7 Jun 2015 17:01:59 +0200
\r
31 Message-Id: <1433689323-7520-7-git-send-email-david@tethera.net>
\r
32 X-Mailer: git-send-email 2.1.4
\r
33 In-Reply-To: <1433689323-7520-1-git-send-email-david@tethera.net>
\r
34 References: <1433689323-7520-1-git-send-email-david@tethera.net>
\r
35 X-BeenThere: notmuch@notmuchmail.org
\r
36 X-Mailman-Version: 2.1.18
\r
38 List-Id: "Use and development of the notmuch mail system."
\r
39 <notmuch.notmuchmail.org>
\r
40 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
41 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
42 List-Archive: <http://notmuchmail.org/pipermail/notmuch/>
\r
43 List-Post: <mailto:notmuch@notmuchmail.org>
\r
44 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
45 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
46 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
47 X-List-Received-Date: Sun, 07 Jun 2015 15:06:17 -0000
\r
49 The plan is to re-use them in testing the same errors from the CLI
\r
51 test/T560-lib-error.sh | 10 ----------
\r
52 test/test-lib-common.sh | 14 ++++++++++++++
\r
53 2 files changed, 14 insertions(+), 10 deletions(-)
\r
55 diff --git a/test/T560-lib-error.sh b/test/T560-lib-error.sh
\r
56 index c99b17e..36607c3 100755
\r
57 --- a/test/T560-lib-error.sh
\r
58 +++ b/test/T560-lib-error.sh
\r
59 @@ -3,16 +3,6 @@ test_description="error reporting for library"
\r
63 -backup_database () {
\r
64 - rm -rf notmuch-dir-backup
\r
65 - cp -pR ${MAIL_DIR}/.notmuch notmuch-dir-backup
\r
67 -restore_database () {
\r
68 - rm -rf ${MAIL_DIR}/.notmuch
\r
69 - cp -pR notmuch-dir-backup ${MAIL_DIR}/.notmuch
\r
75 test_expect_success "building database" "NOTMUCH_NEW"
\r
76 diff --git a/test/test-lib-common.sh b/test/test-lib-common.sh
\r
77 index f99ed11..0d9c839 100644
\r
78 --- a/test/test-lib-common.sh
\r
79 +++ b/test/test-lib-common.sh
\r
80 @@ -34,6 +34,20 @@ find_notmuch_path ()
\r
84 +backup_database () {
\r
85 + test_name=$(basename $0 .sh)
\r
86 + rm -rf notmuch-dir-backup."$test_name"
\r
87 + cp -pR ${MAIL_DIR}/.notmuch notmuch-dir-backup."${test_name}"
\r
90 +restore_database () {
\r
91 + test_name=$(basename $0 .sh)
\r
92 + rm -rf ${MAIL_DIR}/.notmuch
\r
93 + cp -pR notmuch-dir-backup."${test_name}" ${MAIL_DIR}/.notmuch
\r
98 # Test the binaries we have just built. The tests are kept in
\r
99 # test/ subdirectory and are run in 'trash directory' subdirectory.
\r
100 TEST_DIRECTORY=$(pwd)
\r