From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 4EA7C6DE0352 for ; Sun, 27 Aug 2017 05:50:57 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: 0.462 X-Spam-Level: X-Spam-Status: No, score=0.462 tagged_above=-999 required=5 tests=[AWL=-0.171, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_NEUTRAL=0.652, UNPARSEABLE_RELAY=0.001] 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 54vGGKrlkZzU for ; Sun, 27 Aug 2017 05:50:56 -0700 (PDT) Received: from mail-wm0-f53.google.com (mail-wm0-f53.google.com [74.125.82.53]) by arlo.cworth.org (Postfix) with ESMTPS id CE9A06DE0350 for ; Sun, 27 Aug 2017 05:50:55 -0700 (PDT) Received: by mail-wm0-f53.google.com with SMTP id b82so9242975wmd.1 for ; Sun, 27 Aug 2017 05:50:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dme-org.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=98tUXxXPlbhEjY2rV1DlBn4IHl0y/EbpJFyX2Zgx9GA=; b=tnh1qvhaC2XcutIIudem31Z49JtKvE78LATwaiHhQ9WvbR4c75jP/HS4B4XY2Ut6yd 8CsTkI560VUKReE60qfD/mf0ML3D9xSdnti/74mijfKOQqgrT/IM+xtUwXvpCHuFOzHT e2OyWXsluMEnfU27E3ea6zftk9rbVSy6SKkuxx1qyfQ4ahQ/7SLzlfu1GJEBlG6XUXDg bO6Zkoj1rjqaP545Tc2/Nu10bBkfMuPXnGGeVAzT1HM6iUbBDpE66j7dHxy+CKyR6aWZ tBAkny7JcZ0joCLEy9PvoNPyHzgTAUwv++YHpHRUBhG8YjyNNHh4Ipe2MfBzZBPXyqhe RR8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=98tUXxXPlbhEjY2rV1DlBn4IHl0y/EbpJFyX2Zgx9GA=; b=Yu3udmcoQ0HcN0Fro94eIMc3BSdpxMKnxl0EfYIC5l3h1o8/v8obzqOv/oyWojYe20 E5GJU+1IX8++FVwDfwSrNt0x3u8iSdv7fa5PvrHB8vQIt7pksIP7vkFMhz7d0Bn/LSgl n40Sa0wuCruC87H6Xc6S1XELmHdw9RKAGg+NGZ3G+kYHGeWM4czjXhM0DOpW+ZsrYiAS 6p6Fnd589nq3UKDV/CUy/ialFTs0B2gSpr0FA8Ng8EA8noLl3WHiatDoA1Nw+vX+3e7l GKXH2kGAoSkzj/YnEdk3+IbkLBEctubaCQWvdaUPSZ7Qn0oUhu6xkXS1uwB595Gvs8ml 0UMQ== X-Gm-Message-State: AHYfb5hiHlY/pUZnqnkR8R4FTGehcfFu0jIvebAAN7t4DY8tHasMrvw6 ELlSIBNFXc88mQVY2CkDUA== X-Received: by 10.80.147.75 with SMTP id n11mr3951129eda.84.1503838253172; Sun, 27 Aug 2017 05:50:53 -0700 (PDT) Received: from disaster-area.hh.sledj.net (disaster-area.hh.sledj.net. [81.149.164.25]) by smtp.gmail.com with ESMTPSA id s15sm5339809edc.97.2017.08.27.05.50.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 27 Aug 2017 05:50:51 -0700 (PDT) Received: from localhost (disaster-area.hh.sledj.net [local]) by disaster-area.hh.sledj.net (OpenSMTPD) with ESMTPA id 1af3fe84 for ; Sun, 27 Aug 2017 12:50:51 +0000 (UTC) From: David Edmondson To: notmuch@notmuchmail.org Subject: [PATCH v1 1/1] test: Perform T170 tests that don't require dtach before any that do. Date: Sun, 27 Aug 2017 13:50:50 +0100 Message-Id: <20170827125050.22554-1-dme@dme.org> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.23 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: Sun, 27 Aug 2017 12:50:57 -0000 This avoids the later tests seeing different versions of the database depending on whether dtach is available. --- test/T170-sexp.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/test/T170-sexp.sh b/test/T170-sexp.sh index 40e5e21d..db142e49 100755 --- a/test/T170-sexp.sh +++ b/test/T170-sexp.sh @@ -26,6 +26,11 @@ add_message "[subject]=\"sexp-show-utf8-body-sübjéct\"" "[date]=\"Sat, 01 Jan output=$(notmuch show --format=sexp "jsön-show-méssage") test_expect_equal "$output" "((((:id \"${gen_msg_id}\" :match t :excluded nil :filename (\"${gen_msg_filename}\") :timestamp 946728000 :date_relative \"2000-01-01\" :tags (\"inbox\" \"unread\") :headers (:Subject \"sexp-show-utf8-body-sübjéct\" :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 \"jsön-show-méssage\n\"))) ())))" +test_begin_subtest "Search message: sexp, utf-8" +add_message "[subject]=\"sexp-search-utf8-body-sübjéct\"" "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" "[body]=\"jsön-search-méssage\"" +output=$(notmuch search --format=sexp "jsön-search-méssage" | notmuch_search_sanitize) +test_expect_equal "$output" "((:thread \"0000000000000004\" :timestamp 946728000 :date_relative \"2000-01-01\" :matched 1 :total 1 :authors \"Notmuch Test Suite\" :subject \"sexp-search-utf8-body-sübjéct\" :query (\"id:$gen_msg_id\" nil) :tags (\"inbox\" \"unread\")))" + test_begin_subtest "Show message: sexp, inline attachment filename" subject='sexp-show-inline-attachment-filename' id="sexp-show-inline-attachment-filename@notmuchmail.org" @@ -41,10 +46,4 @@ filename=$(notmuch search --output=files "id:$id") attachment_length=$(( $(base64 $TEST_DIRECTORY/README | wc -c) - 1 )) test_expect_equal "$output" "((((:id \"$id\" :match t :excluded nil :filename (\"$filename\") :timestamp 946728000 :date_relative \"2000-01-01\" :tags (\"inbox\") :headers (:Subject \"sexp-show-inline-attachment-filename\" :From \"Notmuch Test Suite \" :To \"test_suite@notmuchmail.org\" :Date \"Sat, 01 Jan 2000 12:00:00 +0000\") :body ((:id 1 :content-type \"multipart/mixed\" :content ((:id 2 :content-type \"text/plain\" :content \"This is a test message with inline attachment with a filename\") (:id 3 :content-type \"application/octet-stream\" :content-disposition \"inline\" :filename \"README\" :content-transfer-encoding \"base64\" :content-length $attachment_length))))) ())))" -test_begin_subtest "Search message: sexp, utf-8" -add_message "[subject]=\"sexp-search-utf8-body-sübjéct\"" "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" "[body]=\"jsön-search-méssage\"" -output=$(notmuch search --format=sexp "jsön-search-méssage" | notmuch_search_sanitize) -test_expect_equal "$output" "((:thread \"0000000000000005\" :timestamp 946728000 :date_relative \"2000-01-01\" :matched 1 :total 1 :authors \"Notmuch Test Suite\" :subject \"sexp-search-utf8-body-sübjéct\" :query (\"id:$gen_msg_id\" nil) :tags (\"inbox\" \"unread\")))" - - test_done -- 2.11.0