From: Felipe Contreras <felipe.contreras@gmail.com>
To: notmuch@notmuchmail.org
Cc: Daniel Kahn Gillmor <dkg@fifthhorseman.net>,
Ludovic LANGE <ll-notmuchmail@lange.nom.fr>,
Tomi Ollila <tomi.ollila@iki.fi>,
Stefano Zacchiroli <zack@upsilon.cc>
Subject: [PATCH 5/9] test: ruby: simplify test_ruby()
Date: Sat, 1 May 2021 06:59:19 -0500 [thread overview]
Message-ID: <20210501115923.483816-6-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20210501115923.483816-1-felipe.contreras@gmail.com>
We always do test_expect_equal_file, so do it in test_ruby() directly.
The only subtest where we don't (get non-existent file) can be easily
modified.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
test/T395-ruby.sh | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/test/T395-ruby.sh b/test/T395-ruby.sh
index 67d6e205..55bf4c2b 100755
--- a/test/T395-ruby.sh
+++ b/test/T395-ruby.sh
@@ -16,9 +16,11 @@ test_ruby() {
EOF
cat
) | $NOTMUCH_RUBY -I "$NOTMUCH_BUILDDIR/bindings/ruby"> OUTPUT
+ test_expect_equal_file EXPECTED OUTPUT
}
test_begin_subtest "compare thread ids"
+notmuch search --sort=oldest-first --output=threads tag:inbox | sed s/^thread:// > EXPECTED
test_ruby <<"EOF"
@q = @db.query('tag:inbox')
@q.sort = Notmuch::SORT_OLDEST_FIRST
@@ -26,10 +28,9 @@ 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 EXPECTED OUTPUT
test_begin_subtest "compare message ids"
+notmuch search --sort=oldest-first --output=messages tag:inbox | sed s/^id:// > EXPECTED
test_ruby <<"EOF"
@q = @db.query('tag:inbox')
@q.sort = Notmuch::SORT_OLDEST_FIRST
@@ -37,40 +38,35 @@ 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 EXPECTED OUTPUT
test_begin_subtest "get non-existent file"
+echo -n true > EXPECTED
test_ruby <<"EOF"
result = @db.find_message_by_filename('i-dont-exist')
print (result == nil)
EOF
-test_expect_equal "$(cat OUTPUT)" "true"
test_begin_subtest "count messages"
+notmuch count --output=messages tag:inbox > EXPECTED
test_ruby <<"EOF"
@q = @db.query('tag:inbox')
print @q.count_messages(),"\n"
EOF
-notmuch count --output=messages tag:inbox > EXPECTED
-test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "count threads"
+notmuch count --output=threads tag:inbox > EXPECTED
test_ruby <<"EOF"
@q = @db.query('tag:inbox')
print @q.count_threads(),"\n"
EOF
-notmuch count --output=threads tag:inbox > EXPECTED
-test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "get all tags"
+notmuch search --output=tags '*' > EXPECTED
test_ruby <<"EOF"
@t = @db.all_tags()
for tag in @t do
print tag,"\n"
end
EOF
-notmuch search --output=tags '*' > EXPECTED
-test_expect_equal_file EXPECTED OUTPUT
test_done
--
2.31.0
next prev parent reply other threads:[~2021-05-01 11:59 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-01 11:59 [PATCH 0/9] test: ruby: several cleanups and simplifications Felipe Contreras
2021-05-01 11:59 ` [PATCH 1/9] test: move test_ruby() inside the only client Felipe Contreras
2021-05-02 10:49 ` David Bremner
2021-05-02 18:28 ` Tomi Ollila
2021-05-01 11:59 ` [PATCH 2/9] test: ruby: refactor test_ruby() Felipe Contreras
2021-05-02 10:50 ` David Bremner
2021-05-01 11:59 ` [PATCH 3/9] test: ruby: simplify MAIL_DIR check Felipe Contreras
2021-05-02 10:51 ` David Bremner
2021-05-01 11:59 ` [PATCH 4/9] test: ruby: simplify MAIL_DIR initialization Felipe Contreras
2021-05-02 10:56 ` David Bremner
2021-05-01 11:59 ` Felipe Contreras [this message]
2021-05-02 11:02 ` [PATCH 5/9] test: ruby: simplify test_ruby() David Bremner
2021-05-02 21:53 ` Felipe Contreras
2021-05-01 11:59 ` [PATCH 6/9] test: ruby: use much more standard puts Felipe Contreras
2021-05-02 11:03 ` David Bremner
2021-05-01 11:59 ` [PATCH 7/9] test: ruby: use much more standard Ruby idioms Felipe Contreras
2021-05-02 11:07 ` David Bremner
2021-05-02 19:00 ` Tomi Ollila
2021-05-05 22:29 ` David Bremner
2021-05-06 11:52 ` Felipe Contreras
2021-05-02 22:11 ` Felipe Contreras
2021-05-01 11:59 ` [PATCH 8/9] test: ruby: don't use instance variables Felipe Contreras
2021-05-02 11:08 ` David Bremner
2021-05-01 11:59 ` [PATCH 9/9] test: ruby: simplify output comparison Felipe Contreras
2021-05-02 11:09 ` David Bremner
2021-05-02 11:22 ` [PATCH 0/9] test: ruby: several cleanups and simplifications David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210501115923.483816-6-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=dkg@fifthhorseman.net \
--cc=ll-notmuchmail@lange.nom.fr \
--cc=notmuch@notmuchmail.org \
--cc=tomi.ollila@iki.fi \
--cc=zack@upsilon.cc \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).