[PATCH] test: sort the output of the "prefix" test in T610-message-property

Tomi Ollila tomi.ollila at iki.fi
Mon Apr 20 13:34:07 PDT 2020


On Sun, Apr 19 2020, Olivier Taïbi wrote:

> 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.

This sure looks good to me.

Tomi

> ---
>  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.
> _______________________________________________
> notmuch mailing list
> notmuch at notmuchmail.org
> https://notmuchmail.org/mailman/listinfo/notmuch


More information about the notmuch mailing list