[PATCH 07/25] test: remove json test for search null result, since it's being more properly tested in search-output

[Carl Worth]

On Sat, 28 May 2011 14:51:42 -0700, Jameson Graef Rollins  wrote:
> 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.

Hi Jamie,

I've pushed the series up to this point now, (along with the vim
improvements that weren't in your original mailing of the series).

I really appreciate the missing-newline bug-fix along with all the
improved testing for that. Thanks! I re-ordered that portion of the
patch series a tiny bit to put the bug fix immediately after the commit
that makes the tests start failing. I also reworded a few commit
messages slightly.

But I didn't make any code changes so it's trivial enough for me to keep
using "git rebase" to keep your series on top of my modified master.

I'll keep posting as I'm pushing.

-Carl
-- next part --
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: 

Re: [PATCH 07/25] test: remove json test for search null result, since it's being more properly tested in search-output

[Carl Worth]

On Sat, 28 May 2011 14:51:42 -0700, Jameson Graef Rollins 
jroll...@finestructure.net wrote:
 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.

Hi Jamie,

I've pushed the series up to this point now, (along with the vim
improvements that weren't in your original mailing of the series).

I really appreciate the missing-newline bug-fix along with all the
improved testing for that. Thanks! I re-ordered that portion of the
patch series a tiny bit to put the bug fix immediately after the commit
that makes the tests start failing. I also reworded a few commit
messages slightly.

But I didn't make any code changes so it's trivial enough for me to keep
using git rebase to keep your series on top of my modified master.

I'll keep posting as I'm pushing.

-Carl


pgp1rTVe2unyr.pgp
Description: PGP signature
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch

[PATCH 07/25] test: remove json test for search null result, since it's being more properly tested in search-output

[Jameson Graef Rollins]

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.
---
 test/json  |4 
 test/search-output |4 +---
 2 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/test/json b/test/json
index 0badb1d..5a2544c 100755
--- 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\"]}]"

-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
diff --git a/test/search-output b/test/search-output
index 8ba8acf..13f9613 100755
--- 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
-cat EXPECTED
 test_expect_equal_file OUTPUT EXPECTED

 test_done
-- 
1.7.4.4

[PATCH 07/25] test: remove json test for search null result, since it's being more properly tested in search-output

[Jameson Graef Rollins]

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.
---
 test/json  |4 
 test/search-output |4 +---
 2 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/test/json b/test/json
index 0badb1d..5a2544c 100755
--- 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\]}]
 
-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
diff --git a/test/search-output b/test/search-output
index 8ba8acf..13f9613 100755
--- 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
-cat EOF EXPECTED
-[]
-EOF
+echo [] EXPECTED
 test_expect_equal_file OUTPUT EXPECTED
 
 test_done
-- 
1.7.4.4

___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch