[PATCH v2 8/11] test: tree: remove require from tests

diff --git a/2e/4c54834f0fe7471aeb057192b46106aa280fb0 b/2e/4c54834f0fe7471aeb057192b46106aa280fb0
new file mode 100644 (file)
index 0000000..856fa8b
--- /dev/null
+++ b/2e/4c54834f0fe7471aeb057192b46106aa280fb0
@@ -0,0 +1,125 @@
+Return-Path: <markwalters1009@gmail.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 7F382431FBD\r
+       for <notmuch@notmuchmail.org>; Fri,  1 Nov 2013 02:24:13 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.201\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+       RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id pIL9AZQkjNxx for <notmuch@notmuchmail.org>;\r
+       Fri,  1 Nov 2013 02:24:09 -0700 (PDT)\r
+Received: from mail-wi0-f180.google.com (mail-wi0-f180.google.com\r
+       [209.85.212.180]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 05BD6431FD5\r
+       for <notmuch@notmuchmail.org>; Fri,  1 Nov 2013 02:24:02 -0700 (PDT)\r
+Received: by mail-wi0-f180.google.com with SMTP id ey11so807848wid.1\r
+       for <notmuch@notmuchmail.org>; Fri, 01 Nov 2013 02:24:02 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:in-reply-to:references;\r
+       bh=x3kG5C9SKQXwxx24/25nUnyk9Dw/1WT8iJTLLpWC0U8=;\r
+       b=pOuKu0v63QW4lR39iQE+Oy7/k2G+gHN9gJZQyFHFfxjFNpxo6R/lzQeuegFIfzP5vI\r
+       BYL8Daeo7bZDn6w7s9XxaIH6IcdDUO+6s8NxfxbEVXuyf6n1MXqNyxkKfcrTWYYIhN7B\r
+       Otf3jjmHS1H9Yk+QrL92H85/qulfCtO3GtlcO7iV+SGWlk09NheJsfKaOHcRaU/hDXyQ\r
+       ++FJPinpf/42YplXRqDWxGCjjbxORT9eLmZsNigEXjyp+gE5AaBPBHJ7tntl2KiFW6kd\r
+       lQm1BiI/5s6UmZ0zYqhT+Hlr+cnBkUIAjPkgokgsYHZVh0W+B1BLkG8yKqTztPO5k6YO\r
+       vMMA==\r
+X-Received: by 10.194.7.98 with SMTP id i2mr400465wja.84.1383297841956;\r
+       Fri, 01 Nov 2013 02:24:01 -0700 (PDT)\r
+Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])\r
+       by mx.google.com with ESMTPSA id ft19sm5598925wic.5.2013.11.01.02.24.01\r
+       for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Fri, 01 Nov 2013 02:24:01 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 8/11] test: tree: remove require from tests\r
+Date: Fri,  1 Nov 2013 09:23:42 +0000\r
+Message-Id: <1383297825-12326-3-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1383297825-12326-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1383087338-10220-1-git-send-email-markwalters1009@gmail.com>\r
+       <1383297825-12326-1-git-send-email-markwalters1009@gmail.com>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Fri, 01 Nov 2013 09:24:14 -0000\r
+\r
+Now tree is included by default we don't need to "require it" in the\r
+test.\r
+---\r
+ test/emacs-tree |    6 ------\r
+ 1 files changed, 0 insertions(+), 6 deletions(-)\r
+\r
+diff --git a/test/emacs-tree b/test/emacs-tree\r
+index 4e3b624..4bdfddd 100755\r
+--- a/test/emacs-tree\r
++++ b/test/emacs-tree\r
+@@ -9,7 +9,6 @@ add_email_corpus\r
+ \r
+ test_begin_subtest "Basic notmuch-tree view in emacs"\r
+ test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
+-          (require (quote notmuch-tree))\r
+           (notmuch-tree "tag:inbox")\r
+           (notmuch-test-wait)\r
+           (test-output)\r
+@@ -18,7 +17,6 @@ test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox\r
+ \r
+ test_begin_subtest "Refreshed notmuch-tree view in emacs"\r
+ test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
+-          (require (quote notmuch-tree))\r
+           (notmuch-tree "tag:inbox")\r
+           (notmuch-test-wait)\r
+           (notmuch-tree-refresh-view)\r
+@@ -33,7 +31,6 @@ test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox\r
+ \r
+ test_begin_subtest "Tag message in notmuch tree view (display)"\r
+ test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
+-          (require (quote notmuch-tree))\r
+           (notmuch-tree "tag:inbox")\r
+           (notmuch-test-wait)\r
+           (forward-line)\r
+@@ -48,7 +45,6 @@ test_expect_equal "$output" "id:877h1wv7mg.fsf@inf-8657.int-evry.fr"\r
+ \r
+ test_begin_subtest "Untag message in notmuch tree view"\r
+ test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
+-          (require (quote notmuch-tree))\r
+           (notmuch-tree "tag:inbox")\r
+           (notmuch-test-wait)\r
+           (forward-line)\r
+@@ -63,7 +59,6 @@ test_expect_equal "$output" ""\r
+ \r
+ test_begin_subtest "Tag thread in notmuch tree view"\r
+ test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
+-          (require (quote notmuch-tree))\r
+           (notmuch-tree "tag:inbox")\r
+           (notmuch-test-wait)\r
+           ;; move to a sizable thread\r
+@@ -86,7 +81,6 @@ id:20091117190054.GU3165@dottiness.seas.harvard.edu"\r
+ \r
+ test_begin_subtest "Untag thread in notmuch tree view"\r
+ test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
+-          (require (quote notmuch-tree))\r
+           (notmuch-tree "tag:inbox")\r
+           (notmuch-test-wait)\r
+           ;; move to the same sizable thread as above\r
+-- \r
+1.7.9.1\r
+\r