]> git.ipfire.org Git - thirdparty/nftables.git/commit
tests/shell: prettify JSON in test output and add helper
authorThomas Haller <thaller@redhat.com>
Wed, 22 Nov 2023 11:19:40 +0000 (12:19 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Wed, 22 Nov 2023 17:51:06 +0000 (18:51 +0100)
commitca3190fffd50e17289ed280a5326a53467491662
treef7ed3ab0bb0d08000f59a48ea7a81d6731175de5
parent485efcd3df69999d713031433d862147eba15cde
tests/shell: prettify JSON in test output and add helper

- add helper script "json-pretty.sh" for prettify/format JSON.
  It uses either `jq` or a `python` fallback. In my tests, they
  produce the same output, but the output is not guaranteed to be
  stable. This is mainly for informational purpose.

- add a "json-diff-pretty.sh" which prettifies two JSON inputs and
  shows a diff of them.

- in "test-wrapper.sh", after the check for a .json-nft dump fails, also
  call "json-diff-pretty.sh" and write the output to "ruleset-diff.json.pretty".
  This is beside "ruleset-diff.json", which contains the original diff.

Signed-off-by: Thomas Haller <thaller@redhat.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
tests/shell/helpers/json-diff-pretty.sh [new file with mode: 0755]
tests/shell/helpers/json-pretty.sh [new file with mode: 0755]
tests/shell/helpers/test-wrapper.sh