From 6675f69d80c3057f5050e0e383227e3712aee764 Mon Sep 17 00:00:00 2001 From: Peter Wang Date: Sat, 22 Jun 2013 15:46:42 +1000 Subject: [PATCH] [PATCH v6 06/12] test: add tests for insert --- 77/428e5ec59219751613409a272418fb4da790f9 | 171 ++++++++++++++++++++++ 1 file changed, 171 insertions(+) create mode 100644 77/428e5ec59219751613409a272418fb4da790f9 diff --git a/77/428e5ec59219751613409a272418fb4da790f9 b/77/428e5ec59219751613409a272418fb4da790f9 new file mode 100644 index 000000000..85bf643ec --- /dev/null +++ b/77/428e5ec59219751613409a272418fb4da790f9 @@ -0,0 +1,171 @@ +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 DFABD431FC4 + for ; Fri, 21 Jun 2013 22:47:50 -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 xByu6NNuUaB0 for ; + Fri, 21 Jun 2013 22:47:44 -0700 (PDT) +Received: from mail-pb0-f41.google.com (mail-pb0-f41.google.com + [209.85.160.41]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 5165F431FAE + for ; Fri, 21 Jun 2013 22:47:26 -0700 (PDT) +Received: by mail-pb0-f41.google.com with SMTP id rp16so8734759pbb.0 + for ; Fri, 21 Jun 2013 22:47:25 -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:x-mailer:in-reply-to:references; + bh=cFI8tSe6Eyh8rSOCGhbSQ1elpywalxWY/JUiJJMe/y0=; + b=meZB3DjVptS635czg7TZr3pcFyc8UdBpAqaNja3huFKoRjd8gMZDk4699IWRPEqi++ + Dz3DpHy0rtWtj6IZGYsF5DQz5Y4/3lm2zjGzoWpldaDFppu3OBIm/IJ3Thx87MDgkf7J + NNvgAARp1WkoUA8ISU1cWGgR1Sp/0l/YTeoLsq1ZEyAwfJyoAks6b9TXwoVh5IKdFCYI + Bu+cXhfu0TKrZqaEHR4NTGEvg/SENXSDQoZbQgSCTuWxFlvor6tZlr4ww9uJRcIPExRW + fO5VgzAUVdsRihgCXNEe6wBOQRy9oN5sZWq6AXMuyPlRfEfA5iS1EHTrZPqq9Fd3TOdw + TEtQ== +X-Received: by 10.66.182.166 with SMTP id ef6mr19696659pac.35.1371880045564; + Fri, 21 Jun 2013 22:47:25 -0700 (PDT) +Received: from localhost (215.42.233.220.static.exetel.com.au. + [220.233.42.215]) + by mx.google.com with ESMTPSA id fp2sm7857266pbb.36.2013.06.21.22.47.23 + for + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Fri, 21 Jun 2013 22:47:24 -0700 (PDT) +From: Peter Wang +To: notmuch@notmuchmail.org +Subject: [PATCH v6 06/12] test: add tests for insert +Date: Sat, 22 Jun 2013 15:46:42 +1000 +Message-Id: <1371880008-18312-7-git-send-email-novalazy@gmail.com> +X-Mailer: git-send-email 1.7.12.1 +In-Reply-To: <1371880008-18312-1-git-send-email-novalazy@gmail.com> +References: <1371880008-18312-1-git-send-email-novalazy@gmail.com> +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: Sat, 22 Jun 2013 05:47:51 -0000 + +Add tests for new 'insert' command. +--- + test/insert | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + test/notmuch-test | 1 + + 2 files changed, 81 insertions(+) + create mode 100755 test/insert + +diff --git a/test/insert b/test/insert +new file mode 100755 +index 0000000..b432a74 +--- /dev/null ++++ b/test/insert +@@ -0,0 +1,80 @@ ++#!/usr/bin/env bash ++test_description='"notmuch insert"' ++. ./test-lib.sh ++ ++# Create directories and database before inserting. ++mkdir -p "$MAIL_DIR"/{cur,new,tmp} ++mkdir -p "$MAIL_DIR"/Drafts/{cur,new,tmp} ++notmuch new > /dev/null ++ ++# We use generate_message to create the temporary message files. ++# They happen to be in the mail directory already but that is okay ++# since we do not call notmuch new hereafter. ++ ++gen_insert_msg() { ++ generate_message \ ++ "[subject]=\"insert-subject\"" \ ++ "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" \ ++ "[body]=\"insert-message\"" ++} ++ ++test_expect_code 1 "Insert zero-length file" \ ++ "notmuch insert < /dev/null" ++ ++# This test is a proxy for other errors that may occur while trying to ++# add a message to the notmuch database, e.g. database locked. ++test_expect_code 0 "Insert non-message" \ ++ "echo bad_message | notmuch insert" ++ ++test_begin_subtest "Database empty so far" ++test_expect_equal "0" "`notmuch count --output=messages '*'`" ++ ++test_begin_subtest "Insert message" ++gen_insert_msg ++notmuch insert < "$gen_msg_filename" ++cur_msg_filename=$(notmuch search --output=files "subject:insert-subject") ++test_expect_equal_file "$cur_msg_filename" "$gen_msg_filename" ++ ++test_begin_subtest "Insert message adds default tags" ++output=$(notmuch show --format=json "subject:insert-subject") ++expected='[[[{ ++ "id": "'"${gen_msg_id}"'", ++ "match": true, ++ "excluded": false, ++ "filename": "'"${cur_msg_filename}"'", ++ "timestamp": 946728000, ++ "date_relative": "2000-01-01", ++ "tags": ["inbox","unread"], ++ "headers": { ++ "Subject": "insert-subject", ++ "From": "Notmuch Test Suite ", ++ "To": "Notmuch Test Suite ", ++ "Date": "Sat, 01 Jan 2000 12:00:00 +0000"}, ++ "body": [{"id": 1, ++ "content-type": "text/plain", ++ "content": "insert-message\n"}]}, ++ []]]]' ++test_expect_equal_json "$output" "$expected" ++ ++test_begin_subtest "Insert duplicate message" ++notmuch insert +duptag -unread < "$gen_msg_filename" ++output=$(notmuch search --output=files "subject:insert-subject" | wc -l) ++test_expect_equal "$output" 2 ++ ++test_begin_subtest "Duplicate message does not change tags" ++output=$(notmuch search --format=json --output=tags "subject:insert-subject") ++test_expect_equal_json "$output" '["inbox", "unread"]' ++ ++test_begin_subtest "Insert message, add tag" ++gen_insert_msg ++notmuch insert +custom < "$gen_msg_filename" ++output=$(notmuch count tag:custom) ++test_expect_equal "$output" "1" ++ ++test_begin_subtest "Insert message, add/remove tags" ++gen_insert_msg ++notmuch insert +custom -unread < "$gen_msg_filename" ++output=$(notmuch count tag:custom NOT tag:unread) ++test_expect_equal "$output" "1" ++ ++test_done +diff --git a/test/notmuch-test b/test/notmuch-test +index a0c47d4..6db7979 100755 +--- a/test/notmuch-test ++++ b/test/notmuch-test +@@ -23,6 +23,7 @@ TESTS=" + setup + new + count ++ insert + search + search-output + search-by-folder +-- +1.7.12.1 + -- 2.26.2