From 1923bcb3c6cb14abd03c5aab9a79ed310939b886 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Thu, 26 Dec 2019 23:57:17 +0000 Subject: [PATCH] ZTS: zfs_program_json As of Python 3.5 the default behavior of json.tool was changed to preserve the input order rather than lexically sort. The test case expects the output to be sorted so apply the --sort-keys option to the json.tool command when using Python 3.5 and the option is supported. https://docs.python.org/3/library/json.html#module-json.tool Signed-off-by: Brian Behlendorf --- .../cli_root/zfs_program/zfs_program_json.ksh | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_program/zfs_program_json.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_program/zfs_program_json.ksh index 3d59f784a488..3788543b0b2f 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_program/zfs_program_json.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_program/zfs_program_json.ksh @@ -91,14 +91,28 @@ typeset -a pos_cmds_out=( } } }") + +# +# N.B. json.tool is needed to guarantee consistent ordering of fields, +# sed is needed to trim trailing space in CentOS 6's json.tool output +# +# As of Python 3.5 the behavior of json.tool changed to keep the order +# the same as the input and the --sort-keys option was added. Detect when +# --sort-keys is supported and apply the option to ensure the expected order. +# +if python -m json.tool --sort-keys <<< "{}"; then + JSON_TOOL_CMD="python -m json.tool --sort-keys" +else + JSON_TOOL_CMD="python -m json.tool" +fi + typeset -i cnt=0 typeset cmd for cmd in ${pos_cmds[@]}; do log_must zfs program $TESTPOOL $TESTZCP $TESTDS $cmd 2>&1 log_must zfs program -j $TESTPOOL $TESTZCP $TESTDS $cmd 2>&1 - # json.tool is needed to guarantee consistent ordering of fields - # sed is needed to trim trailing space in CentOS 6's json.tool output - OUTPUT=$(zfs program -j $TESTPOOL $TESTZCP $TESTDS $cmd 2>&1 | python -m json.tool | sed 's/[[:space:]]*$//') + OUTPUT=$(zfs program -j $TESTPOOL $TESTZCP $TESTDS $cmd 2>&1 | + $JSON_TOOL_CMD | sed 's/[[:space:]]*$//') if [ "$OUTPUT" != "${pos_cmds_out[$cnt]}" ]; then log_note "Got :$OUTPUT" log_note "Expected:${pos_cmds_out[$cnt]}"