From c32ccfec05bf77c7a55704ce60a30b0dad24bb31 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Tue, 30 Dec 2014 21:29:38 +0100 Subject: [PATCH] [Patch v2 3/5] test: port existing python tests to ruby --- 2b/21f892ac6b3cb5d23f78a60e4a475106144d45 | 182 ++++++++++++++++++++++ 1 file changed, 182 insertions(+) create mode 100644 2b/21f892ac6b3cb5d23f78a60e4a475106144d45 diff --git a/2b/21f892ac6b3cb5d23f78a60e4a475106144d45 b/2b/21f892ac6b3cb5d23f78a60e4a475106144d45 new file mode 100644 index 000000000..b3b17e171 --- /dev/null +++ b/2b/21f892ac6b3cb5d23f78a60e4a475106144d45 @@ -0,0 +1,182 @@ +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 B3322431FDA + for ; Tue, 30 Dec 2014 12:30:50 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + 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 fkWVumuvjaeQ for ; + Tue, 30 Dec 2014 12:30:47 -0800 (PST) +Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155]) + (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 7228E431FCB + for ; Tue, 30 Dec 2014 12:30:47 -0800 (PST) +Received: from remotemail by yantan.tethera.net with local (Exim 4.80) + (envelope-from ) + id 1Y63RH-00010Q-7B; Tue, 30 Dec 2014 16:30:47 -0400 +Received: (nullmailer pid 10595 invoked by uid 1000); Tue, 30 Dec 2014 + 20:29:44 -0000 +From: David Bremner +To: notmuch@notmuchmail.org +Subject: [Patch v2 3/5] test: port existing python tests to ruby +Date: Tue, 30 Dec 2014 21:29:38 +0100 +Message-Id: <1419971380-10307-4-git-send-email-david@tethera.net> +X-Mailer: git-send-email 2.1.3 +In-Reply-To: <1419971380-10307-1-git-send-email-david@tethera.net> +References: <1419971380-10307-1-git-send-email-david@tethera.net> +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: Tue, 30 Dec 2014 20:30:51 -0000 + +This is pretty much a line by line translation. Add a dependency of +the test suite on the ruby bindings, as these are currently not built +by default. +--- + test/Makefile.local | 2 +- + test/T395-ruby.sh | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + test/test-lib.sh | 5 ++++ + 3 files changed, 92 insertions(+), 1 deletion(-) + create mode 100755 test/T395-ruby.sh + +diff --git a/test/Makefile.local b/test/Makefile.local +index 2331ceb..9423680 100644 +--- a/test/Makefile.local ++++ b/test/Makefile.local +@@ -55,7 +55,7 @@ TEST_BINARIES := $(TEST_BINARIES:.cc=) + + test-binaries: $(TEST_BINARIES) + +-test: all test-binaries ++test: all test-binaries ruby-bindings + @${test_src_dir}/notmuch-test $(OPTIONS) + + check: test +diff --git a/test/T395-ruby.sh b/test/T395-ruby.sh +new file mode 100755 +index 0000000..6b89a5d +--- /dev/null ++++ b/test/T395-ruby.sh +@@ -0,0 +1,86 @@ ++#!/usr/bin/env bash ++test_description="ruby bindings" ++. ./test-lib.sh ++ ++if [ "${NOTMUCH_HAVE_RUBY_DEV}" = "0" ]; then ++ test_subtest_missing_external_prereq_["ruby development files"]=t ++fi ++ ++add_email_corpus ++ ++test_begin_subtest "compare thread ids" ++test_ruby <<"EOF" ++require 'notmuch' ++$maildir = ENV['MAIL_DIR'] ++if not $maildir then ++ abort('environment variable MAIL_DIR must be set') ++end ++@db = Notmuch::Database.new($maildir) ++@q = @db.query('tag:inbox') ++@q.sort = Notmuch::SORT_OLDEST_FIRST ++for t in @q.search_threads do ++ print t.thread_id, "\n" ++end ++EOF ++notmuch search --sort=oldest-first --output=threads tag:inbox | sed s/^thread:// > EXPECTED ++test_expect_equal_file OUTPUT EXPECTED ++ ++test_begin_subtest "compare message ids" ++test_ruby <<"EOF" ++require 'notmuch' ++$maildir = ENV['MAIL_DIR'] ++if not $maildir then ++ abort('environment variable MAIL_DIR must be set') ++end ++@db = Notmuch::Database.new($maildir) ++@q = @db.query('tag:inbox') ++@q.sort = Notmuch::SORT_OLDEST_FIRST ++for m in @q.search_messages do ++ print m.message_id, "\n" ++end ++EOF ++notmuch search --sort=oldest-first --output=messages tag:inbox | sed s/^id:// > EXPECTED ++test_expect_equal_file OUTPUT EXPECTED ++ ++test_begin_subtest "get non-existent file" ++test_ruby <<"EOF" ++require 'notmuch' ++$maildir = ENV['MAIL_DIR'] ++if not $maildir then ++ abort('environment variable MAIL_DIR must be set') ++end ++@db = Notmuch::Database.new($maildir) ++result = @db.find_message_by_filename('i-dont-exist') ++print (result == nil) ++EOF ++test_expect_equal "$(cat OUTPUT)" "true" ++ ++test_begin_subtest "count messages" ++test_ruby <<"EOF" ++require 'notmuch' ++$maildir = ENV['MAIL_DIR'] ++if not $maildir then ++ abort('environment variable MAIL_DIR must be set') ++end ++@db = Notmuch::Database.new($maildir) ++@q = @db.query('tag:inbox') ++print @q.count_messages(),"\n" ++EOF ++notmuch count --output=messages tag:inbox > EXPECTED ++test_expect_equal_file OUTPUT EXPECTED ++ ++test_begin_subtest "count messages" ++test_ruby <<"EOF" ++require 'notmuch' ++$maildir = ENV['MAIL_DIR'] ++if not $maildir then ++ abort('environment variable MAIL_DIR must be set') ++end ++@db = Notmuch::Database.new($maildir) ++@q = @db.query('tag:inbox') ++print @q.count_threads(),"\n" ++EOF ++notmuch count --output=threads tag:inbox > EXPECTED ++test_expect_equal_file OUTPUT EXPECTED ++ ++test_done +diff --git a/test/test-lib.sh b/test/test-lib.sh +index 53db9ca..3bbdc03 100644 +--- a/test/test-lib.sh ++++ b/test/test-lib.sh +@@ -1156,6 +1156,11 @@ test_python() { + | $cmd - + } + ++test_ruby() { ++ export LD_LIBRARY_PATH=$TEST_DIRECTORY/../lib ++ MAIL_DIR=$MAIL_DIR ruby -I $TEST_DIRECTORY/../bindings/ruby> OUTPUT ++} ++ + # Creates a script that counts how much time it is executed and calls + # notmuch. $notmuch_counter_command is set to the path to the + # generated script. Use notmuch_counter_value() function to get the +-- +2.1.3 + -- 2.26.2