From 805f39fa689a97d1bff0c02bd1bff950a6e0382d Mon Sep 17 00:00:00 2001 From: David Bremner Date: Wed, 8 Apr 2015 23:45:36 +0900 Subject: [PATCH] [PATCH 1/2] test: be consistent about spelling `nonexistent' --- a4/3e2af83d9d032695ce35724107c5142ad423d9 | 97 +++++++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 a4/3e2af83d9d032695ce35724107c5142ad423d9 diff --git a/a4/3e2af83d9d032695ce35724107c5142ad423d9 b/a4/3e2af83d9d032695ce35724107c5142ad423d9 new file mode 100644 index 000000000..c13232348 --- /dev/null +++ b/a4/3e2af83d9d032695ce35724107c5142ad423d9 @@ -0,0 +1,97 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by arlo.cworth.org (Postfix) with ESMTP id 065ED6DE1997 + for ; Wed, 8 Apr 2015 07:47:15 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: 0.404 +X-Spam-Level: +X-Spam-Status: No, score=0.404 tagged_above=-999 required=5 tests=[AWL=0.394, + T_HEADER_FROM_DIFFERENT_DOMAINS=0.01] autolearn=disabled +Received: from arlo.cworth.org ([127.0.0.1]) + by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id l6-rg8sj9l2t for ; + Wed, 8 Apr 2015 07:47:13 -0700 (PDT) +Received: from mx.xen14.node3324.gplhost.com (gitolite.debian.net + [87.98.215.224]) + by arlo.cworth.org (Postfix) with ESMTPS id 3AD2A6DE025E + for ; Wed, 8 Apr 2015 07:47:13 -0700 (PDT) +Received: from remotemail by mx.xen14.node3324.gplhost.com with local (Exim + 4.80) (envelope-from ) + id 1YfrEv-0005Fx-T8; Wed, 08 Apr 2015 14:46:01 +0000 +Received: (nullmailer pid 18404 invoked by uid 1000); Wed, 08 Apr 2015 + 14:45:44 -0000 +From: David Bremner +To: Tomi Ollila , David Bremner , + notmuch@notmuchmail.org +Subject: [PATCH 1/2] test: be consistent about spelling `nonexistent' +Date: Wed, 8 Apr 2015 23:45:36 +0900 +Message-Id: <1428504337-18362-1-git-send-email-david@tethera.net> +X-Mailer: git-send-email 2.1.4 +In-Reply-To: +References: +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.18 +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: Wed, 08 Apr 2015 14:47:15 -0000 + +Apparently most of the misspellings are my fault. +--- + test/T360-symbol-hiding.sh | 2 +- + test/T560-lib-error.sh | 2 +- + test/symbol-test.cc | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/test/T360-symbol-hiding.sh b/test/T360-symbol-hiding.sh +index 8fc4bdf..d2b5d1f 100755 +--- a/test/T360-symbol-hiding.sh ++++ b/test/T360-symbol-hiding.sh +@@ -16,7 +16,7 @@ run_test(){ + } + + output="A Xapian exception occurred opening database: Couldn't stat 'fakedb/.notmuch/xapian' +-caught No chert database found at path \`./nonexistant'" ++caught No chert database found at path \`./nonexistent'" + + mkdir -p fakedb/.notmuch + +diff --git a/test/T560-lib-error.sh b/test/T560-lib-error.sh +index 828a44b..6947aa8 100755 +--- a/test/T560-lib-error.sh ++++ b/test/T560-lib-error.sh +@@ -202,7 +202,7 @@ test_begin_subtest "Xapian exception finding message" + cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR} + { + notmuch_message_t *message = NULL; +- stat = notmuch_database_find_message (db, "id:nonexistant", &message); ++ stat = notmuch_database_find_message (db, "id:nonexistent", &message); + } + EOF + sed 's/^\(A Xapian exception [^:]*\):.*$/\1/' < OUTPUT > OUTPUT.clean +diff --git a/test/symbol-test.cc b/test/symbol-test.cc +index d979f83..f17ddc8 100644 +--- a/test/symbol-test.cc ++++ b/test/symbol-test.cc +@@ -15,7 +15,7 @@ int main() { + } + + try { +- (void) new Xapian::WritableDatabase("./nonexistant", Xapian::DB_OPEN); ++ (void) new Xapian::WritableDatabase("./nonexistent", Xapian::DB_OPEN); + } catch (const Xapian::Error &error) { + printf("caught %s\n", error.get_msg().c_str()); + return 0; +-- +2.1.4 + -- 2.26.2