test: remove json test for search null result, since it's being more properly tested...

The test in json was inferior to the one in search-output, since it
wasn't properly testing for the presence of a trailing newline.

diff --git a/test/json b/test/json
index 0badb1d237c9e0ae71cbd7d6bbbdb32b68aba76f..5a2544c243ec06ab3937ab5fe6aae34aefdd4515 100755 (executable)
--- a/test/json
+++ b/test/json
@@ -34,8 +34,4 @@ test_expect_equal "$output" "[{\"thread\": \"XXX\",
 \"subject\": \"json-search-utf8-body-sübjéct\",
 \"tags\": [\"inbox\", \"unread\"]}]"
 
 \"subject\": \"json-search-utf8-body-sübjéct\",
 \"tags\": [\"inbox\", \"unread\"]}]"
 

-test_begin_subtest "Search returning no messages"
-output=$(notmuch search --format=json "this string had better not match any messages" | notmuch_search_sanitize)
-test_expect_equal "$output" "[]"
-

 test_done
 test_done

diff --git a/test/search-output b/test/search-output
index 8ba8acf741af29172e97c12a2cac2caa8a54d640..13f9613065761985dcdd7bfef9724bf0e27bc54c 100755 (executable)
--- a/test/search-output
+++ b/test/search-output
@@ -311,9 +311,7 @@ test_expect_equal_file OUTPUT EXPECTED
 
 test_begin_subtest "notmuch search --format=json for non-existent message prints proper empty json"
 notmuch search --format=json "no-message-matches-this" > OUTPUT
 
 test_begin_subtest "notmuch search --format=json for non-existent message prints proper empty json"
 notmuch search --format=json "no-message-matches-this" > OUTPUT

-cat <<EOF >EXPECTED
-[]
-EOF
+echo "[]" >EXPECTED

 test_expect_equal_file OUTPUT EXPECTED
 
 test_done
 test_expect_equal_file OUTPUT EXPECTED
 
 test_done