From 52fc84d57d23b7dae9e6e8759dacc7b5b11c72b5 Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Sat, 1 Dec 2012 00:21:35 +0200 Subject: [PATCH] Re: [Patch v2 04/17] test: add database routines for testing --- 9b/e8d5a5b720bce8762bdda692119f8f71b22ed1 | 216 ++++++++++++++++++++++ 1 file changed, 216 insertions(+) create mode 100644 9b/e8d5a5b720bce8762bdda692119f8f71b22ed1 diff --git a/9b/e8d5a5b720bce8762bdda692119f8f71b22ed1 b/9b/e8d5a5b720bce8762bdda692119f8f71b22ed1 new file mode 100644 index 000000000..89d4d9e7b --- /dev/null +++ b/9b/e8d5a5b720bce8762bdda692119f8f71b22ed1 @@ -0,0 +1,216 @@ +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 87707431FAF + for ; Fri, 30 Nov 2012 14:21:45 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[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 PtoeNFEiPELS for ; + Fri, 30 Nov 2012 14:21:40 -0800 (PST) +Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com + [209.85.217.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 7FF0B431FAE + for ; Fri, 30 Nov 2012 14:21:40 -0800 (PST) +Received: by mail-lb0-f181.google.com with SMTP id ge1so935721lbb.26 + for ; Fri, 30 Nov 2012 14:21:38 -0800 (PST) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=google.com; s=20120113; + h=from:to:cc:subject:in-reply-to:references:user-agent:date + :message-id:mime-version:content-type:x-gm-message-state; + bh=lNfmO+sAYoAFYsfF61BfMhwkVPTCHE52D5lABEpVmzs=; + b=adn9QV8/rHxyjddlsM8lIwVXjfr7AJURVlFpgzaF57yBQJTmLFKiCot9tlOKWo9zzp + n9PuGj/DGhWvCN3ewx776SSEA5OECgO5PT2BH7e23798HxF/HfOsYSn6PvWXLkSxjEPp + Umqi/yG39l6MmWNtr86+BA07ZgvAkHKA8r/nxffo/rtSJWqq3BjH84cF/sJZ7JgI7Fp6 + ei5UlPsAVO7BCdXGzN9gvBBvR5IeEeP5eZaa8e0aBRhNIWlWaaHZdcMDGOs0AusurdB3 + upqxalODlx8o/MQNc/3dLeMc2kQx+VwAt2u6wqjK7rMWJkAZ78u/unCr+b59tw3O/+Cd + 8x1w== +Received: by 10.152.106.237 with SMTP id gx13mr2613750lab.46.1354314098830; + Fri, 30 Nov 2012 14:21:38 -0800 (PST) +Received: from localhost (dsl-hkibrasgw4-fe51df00-27.dhcp.inet.fi. + [80.223.81.27]) + by mx.google.com with ESMTPS id er8sm2540813lbb.9.2012.11.30.14.21.36 + (version=SSLv3 cipher=OTHER); Fri, 30 Nov 2012 14:21:37 -0800 (PST) +From: Jani Nikula +To: david@tethera.net, notmuch@notmuchmail.org +Subject: Re: [Patch v2 04/17] test: add database routines for testing +In-Reply-To: <1353792017-31459-5-git-send-email-david@tethera.net> +References: <1353792017-31459-1-git-send-email-david@tethera.net> + <1353792017-31459-5-git-send-email-david@tethera.net> +User-Agent: Notmuch/0.14+124~g3b17402 (http://notmuchmail.org) Emacs/23.4.1 + (i686-pc-linux-gnu) +Date: Sat, 01 Dec 2012 00:21:35 +0200 +Message-ID: <87obieivf4.fsf@nikula.org> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-Gm-Message-State: + ALoCoQn+XFfadHEYDbQYKaQlBT5UVYe8rPdWK9GNx/HKjsRHezGHMmkKJE2q0N4Dh1FtpxfJyHnp +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, 30 Nov 2012 22:21:45 -0000 + +On Sat, 24 Nov 2012, david@tethera.net wrote: +> From: David Bremner +> +> Initially, provide a way to create "stub" messages in the notmuch +> database without corresponding files. This is essentially cut and +> paste from lib/database.cc. This is a seperate file since we don't +> want to export these symbols from libnotmuch or bloat the library with +> non-exported code. +> --- +> test/Makefile.local | 1 + +> test/database-test.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++ +> test/database-test.h | 21 +++++++++++++++ +> 3 files changed, 93 insertions(+) +> create mode 100644 test/database-test.c +> create mode 100644 test/database-test.h +> +> diff --git a/test/Makefile.local b/test/Makefile.local +> index 8da4c56..8479f91 100644 +> --- a/test/Makefile.local +> +++ b/test/Makefile.local +> @@ -45,5 +45,6 @@ CLEAN := $(CLEAN) $(dir)/smtp-dummy $(dir)/smtp-dummy.o \ +> $(dir)/symbol-test $(dir)/symbol-test.o \ +> $(dir)/arg-test $(dir)/arg-test.o \ +> $(dir)/hex-xcode $(dir)/hex-xcode.o \ +> + $(dir)/database-test.o \ +> $(dir)/parse-time $(dir)/parse-time.o \ +> $(dir)/corpus.mail $(dir)/test-results $(dir)/tmp.* +> diff --git a/test/database-test.c b/test/database-test.c +> new file mode 100644 +> index 0000000..739e03b +> --- /dev/null +> +++ b/test/database-test.c +> @@ -0,0 +1,71 @@ +> +/* +> + * Database routines intended only for testing, not exported from +> + * library. +> + * +> + * Copyright (c) 2012 David Bremner +> + * +> + * This program is free software: you can redistribute it and/or modify +> + * it under the terms of the GNU General Public License as published by +> + * the Free Software Foundation, either version 3 of the License, or +> + * (at your option) any later version. +> + * +> + * This program is distributed in the hope that it will be useful, +> + * but WITHOUT ANY WARRANTY; without even the implied warranty of +> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +> + * GNU General Public License for more details. +> + * +> + * You should have received a copy of the GNU General Public License +> + * along with this program. If not, see http://www.gnu.org/licenses/ . +> + * +> + * Author: David Bremner +> + */ +> + +> +#include "notmuch-private.h" +> +#include "database-test.h" +> + +> +notmuch_status_t +> +notmuch_database_add_stub_message (notmuch_database_t *notmuch, +> + const char *message_id, +> + const char **tags) +> +{ +> + const char **tag; +> + notmuch_status_t ret; +> + notmuch_private_status_t private_status; +> + notmuch_message_t *message; +> + +> + ret = _notmuch_database_ensure_writable (notmuch); +> + if (ret) +> + return ret; +> + +> + message = _notmuch_message_create_for_message_id (notmuch, +> + message_id, +> + &private_status); +> + if (message == NULL) { +> + return COERCE_STATUS (private_status, +> + "Unexpected status value from _notmuch_message_create_for_message_id"); +> + +> + } +> + +> + if (private_status != NOTMUCH_PRIVATE_STATUS_NO_DOCUMENT_FOUND) +> + return NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID; +> + +> + _notmuch_message_add_term (message, "type", "mail"); +> + +> + if (tags) { +> + ret = notmuch_message_freeze (message); +> + if (ret) +> + return ret; +> + +> + for (tag = tags; *tag; tag++) { +> + ret = notmuch_message_add_tag (message, *tag); +> + if (ret) +> + return ret; +> + } +> + } +> + +> + ret = notmuch_message_thaw (message); +> + if (ret) +> + return ret; + +You'll get NOTMUCH_STATUS_UNBALANCED_FREEZE_THAW whenever tags == +NULL. You need to move thaw within the if (tags) block. + +Otherwise, looks good. + +BR, +Jani. + +> + +> + return NOTMUCH_STATUS_SUCCESS; +> +} +> diff --git a/test/database-test.h b/test/database-test.h +> new file mode 100644 +> index 0000000..84f7988 +> --- /dev/null +> +++ b/test/database-test.h +> @@ -0,0 +1,21 @@ +> +#ifndef _DATABASE_TEST_H +> +#define _DATABASE_TEST_H +> +/* Add a new stub message to the given notmuch database. +> + * +> + * At least the following return values are possible: +> + * +> + * NOTMUCH_STATUS_SUCCESS: Message successfully added to database. +> + * +> + * NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID: Message has the same message +> + * ID as another message already in the database. +> + * +> + * NOTMUCH_STATUS_READ_ONLY_DATABASE: Database was opened in read-only +> + * mode so no message can be added. +> + */ +> + +> +notmuch_status_t +> +notmuch_database_add_stub_message (notmuch_database_t *database, +> + const char *message_id, +> + const char **tag_list); +> + +> +#endif +> -- +> 1.7.10.4 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch -- 2.26.2