From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Sat, 1 May 2021 11:59:23 +0000 (-0500)
Subject: test: ruby: simplify output comparison
X-Git-Tag: archive/debian/0.33_rc0-1~114
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=ac64de450a4d61c49fef509ce376fc4d096bb5b5;hp=faf5511c3e343c3a652df664a0f7b4bd60f3bdaa;p=notmuch

test: ruby: simplify output comparison

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---

diff --git a/test/T395-ruby.sh b/test/T395-ruby.sh
index 30168109..597330d3 100755
--- a/test/T395-ruby.sh
+++ b/test/T395-ruby.sh
@@ -20,22 +20,22 @@ test_ruby() {
 }
 
 test_begin_subtest "compare thread ids"
-notmuch search --sort=oldest-first --output=threads tag:inbox | sed s/^thread:// > EXPECTED
+notmuch search --sort=oldest-first --output=threads tag:inbox > EXPECTED
 test_ruby <<"EOF"
 q = db.query('tag:inbox')
 q.sort = Notmuch::SORT_OLDEST_FIRST
 q.search_threads.each do |t|
-  puts t.thread_id
+  puts 'thread:%s' % t.thread_id
 end
 EOF
 
 test_begin_subtest "compare message ids"
-notmuch search --sort=oldest-first --output=messages tag:inbox | sed s/^id:// > EXPECTED
+notmuch search --sort=oldest-first --output=messages tag:inbox > EXPECTED
 test_ruby <<"EOF"
 q = db.query('tag:inbox')
 q.sort = Notmuch::SORT_OLDEST_FIRST
 q.search_messages.each do |m|
-  puts m.message_id
+  puts 'id:%s' % m.message_id
 end
 EOF