aboutsummaryrefslogtreecommitdiffhomepage
path: root/test
diff options
context:
space:
mode:
authorGravatar Carl Worth <cworth@cworth.org>2010-11-06 12:03:51 -0700
committerGravatar Carl Worth <cworth@cworth.org>2010-11-06 12:03:51 -0700
commit81d3bd3670f570c9aeb7e1f3b317b86194ee4426 (patch)
tree0a0149bffd49998c2325bf5d33e1f0842e488483 /test
parent581ea7c8d39c9de73282b21de16dd9b0192ec5ac (diff)
Rename "notmuch cat" to "notmuch show --format=raw"
This is part of an effort to avoid proliferation of excessive top-level notmuch commands. Also, "raw" better captures the functionality here, (as opposed to "cat" which is a fairly oblique reference to a bad Unix abbreviation whose metaphor doesn't work here since "notmuch cat" operates only on a single message and hence cannot "con'cat'enate" anything).
Diffstat (limited to 'test')
-rwxr-xr-xtest/notmuch-test2
-rwxr-xr-xtest/raw (renamed from test/cat)18
2 files changed, 8 insertions, 12 deletions
diff --git a/test/notmuch-test b/test/notmuch-test
index 6b894090..9a3c6983 100755
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -16,7 +16,7 @@ fi
cd $(dirname "$0")
-TESTS="basic new search json thread-naming reply cat dump-restore uuencode thread-order author-order from-guessing long-id encoding emacs"
+TESTS="basic new search json thread-naming raw reply dump-restore uuencode thread-order author-order from-guessing long-id encoding emacs"
# Clean up any results from a previous run
rm -r test-results >/dev/null 2>/dev/null
diff --git a/test/cat b/test/raw
index c2cfedb8..4ed237c1 100755
--- a/test/cat
+++ b/test/raw
@@ -1,6 +1,6 @@
#!/bin/bash
-test_description='notmuch cat'
+test_description='notmuch show --format=raw'
. ./test-lib.sh
test_begin_subtest "Generate some messages"
@@ -9,16 +9,12 @@ generate_message
output=$(NOTMUCH_NEW)
test_expect_equal "$output" "Added 2 new messages to the database."
-test_begin_subtest "Without arguments"
-output=$(notmuch cat 2>&1)
-test_expect_equal "$output" "Error: notmuch cat requires at least one search term."
-
-test_begin_subtest "Attempt to cat multiple messages"
-output=$(notmuch cat "*" 2>&1)
+test_begin_subtest "Attempt to show multiple raw messages"
+output=$(notmuch show --format=raw "*" 2>&1)
test_expect_equal "$output" "Error: search term did not match precisely one message."
-test_begin_subtest "Cat a message"
-output=$(notmuch cat id:msg-001@notmuch-test-suite)
+test_begin_subtest "Show a raw message"
+output=$(notmuch show --format=raw id:msg-001@notmuch-test-suite)
test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
To: Notmuch Test Suite <test_suite@notmuchmail.org>
Message-Id: <msg-001@notmuch-test-suite>
@@ -27,8 +23,8 @@ Date: Tue, 05 Jan 2001 15:43:57 -0000
This is just a test message (#1)"
-test_begin_subtest "Cat another message"
-output=$(notmuch cat id:msg-002@notmuch-test-suite)
+test_begin_subtest "Show another raw message"
+output=$(notmuch show --format=raw id:msg-002@notmuch-test-suite)
test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
To: Notmuch Test Suite <test_suite@notmuchmail.org>
Message-Id: <msg-002@notmuch-test-suite>