From: "Olivier Taïbi" <oli@olitb.net>
To: notmuch@notmuchmail.org
Subject: [PATCH] test: sort the output of the "prefix" test in T610-message-property
Date: Sun, 19 Apr 2020 18:06:19 +0200 [thread overview]
Message-ID: <20200419160619.6c3utfudjhtinphw@siegel.lan> (raw)
This test extracts values from a (key,value) map where multiple entries
can have the same key, and the entries are sorted by key, but not by
value. The test incorrectly assumes that the values will be sorted as
well, so sort the output.
---
test/T610-message-property.sh | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/test/T610-message-property.sh b/test/T610-message-property.sh
index 53a0be3b..b8774230 100755
--- a/test/T610-message-property.sh
+++ b/test/T610-message-property.sh
@@ -186,6 +186,18 @@ EXPECT0(notmuch_message_add_property (message, "testkey3", "testvalue3"));
EXPECT0(notmuch_message_add_property (message, "testkey3", "alice3"));
print_properties (message, "testkey", FALSE);
EOF
+# expected: 4 values for testkey1, 3 values for testkey3
+# they are not guaranteed to be sorted, so sort them, leaving the first
+# line '== stdout ==' and the end ('== stderr ==' and whatever error
+# may have been printed) alone
+mv OUTPUT unsorted_OUTPUT
+awk ' NR == 1 { print; next } \
+ NR < 6 { print | "sort"; next } \
+ NR == 6 { close("sort") } \
+ NR < 9 { print | "sort"; next } \
+ NR == 9 { close("sort") } \
+ { print }' unsorted_OUTPUT > OUTPUT
+rm unsorted_OUTPUT
cat <<'EOF' >EXPECTED
== stdout ==
alice
--
2.26.1
---
a better version of the previous patch I sent with head/tail replaced by an awk
script by Tomi Ollila which is clearer, and comments added in the test for
clarity.
next reply other threads:[~2020-04-19 16:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-19 16:06 Olivier Taïbi [this message]
2020-04-20 20:34 ` [PATCH] test: sort the output of the "prefix" test in T610-message-property Tomi Ollila
2020-04-24 0:33 ` 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=20200419160619.6c3utfudjhtinphw@siegel.lan \
--to=oli@olitb.net \
--cc=notmuch@notmuchmail.org \
/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).