diff options
| author | Thomas Haller <thaller@redhat.com> | 2024-02-09 13:10:39 +0100 |
|---|---|---|
| committer | Phil Sutter <phil@nwl.cc> | 2024-02-09 15:35:02 +0100 |
| commit | da28f381537415d3278bd0399175b6d82fc14200 (patch) | |
| tree | 0cd1dffdd195d77a03ac419ab71fc73871e6a2f8 /tests/shell | |
| parent | 624b034b83a66ec2263314db9dc62ac06b1ae7e7 (diff) | |
tests/shell: no longer support unprettified ".json-nft" files
By now, all ".json-nft" files are prettified and will be generated in
that form.
Drop the fallback code that accepts them in the previous form.
Signed-off-by: Thomas Haller <thaller@redhat.com>
Signed-off-by: Phil Sutter <phil@nwl.cc>
Diffstat (limited to 'tests/shell')
| -rwxr-xr-x | tests/shell/helpers/test-wrapper.sh | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/tests/shell/helpers/test-wrapper.sh b/tests/shell/helpers/test-wrapper.sh index f1f33991..c016e0ce 100755 --- a/tests/shell/helpers/test-wrapper.sh +++ b/tests/shell/helpers/test-wrapper.sh @@ -191,12 +191,7 @@ if [ "$rc_test" -eq 0 -a '(' "$DUMPGEN" = all -o "$DUMPGEN" = y ')' ] ; then cat "$NFT_TEST_TESTTMPDIR/ruleset-after" > "$DUMPFILE" fi if [ "$NFT_TEST_HAVE_json" != n -a "$gen_jdumpfile" = y ] ; then - if cmp "$NFT_TEST_TESTTMPDIR/ruleset-after.json" "$JDUMPFILE" &>/dev/null ; then - # The .json-nft file is still the non-pretty variant. Keep it. - : - else - cat "$NFT_TEST_TESTTMPDIR/ruleset-after.json-pretty" > "$JDUMPFILE" - fi + cat "$NFT_TEST_TESTTMPDIR/ruleset-after.json-pretty" > "$JDUMPFILE" fi fi @@ -211,16 +206,8 @@ if [ "$rc_test" -ne 77 -a "$dump_written" != y ] ; then fi fi if [ "$NFT_TEST_HAVE_json" != n -a -f "$JDUMPFILE" ] ; then - JDUMPFILE2="$NFT_TEST_TESTTMPDIR/json-nft-pretty" - json_pretty "$JDUMPFILE" > "$JDUMPFILE2" - if cmp "$JDUMPFILE" "$JDUMPFILE2" &>/dev/null ; then - # The .json-nft file is already prettified. We can use - # it directly. - rm -rf "$JDUMPFILE2" - JDUMPFILE2="$JDUMPFILE" - fi - if ! $DIFF -u "$JDUMPFILE2" "$NFT_TEST_TESTTMPDIR/ruleset-after.json-pretty" &> "$NFT_TEST_TESTTMPDIR/ruleset-diff.json" ; then - show_file "$NFT_TEST_TESTTMPDIR/ruleset-diff.json" "Failed \`$DIFF -u \"$JDUMPFILE2\" \"$NFT_TEST_TESTTMPDIR/ruleset-after.json-pretty\"\`" >> "$NFT_TEST_TESTTMPDIR/rc-failed-dump" + if ! $DIFF -u "$JDUMPFILE" "$NFT_TEST_TESTTMPDIR/ruleset-after.json-pretty" &> "$NFT_TEST_TESTTMPDIR/ruleset-diff.json" ; then + show_file "$NFT_TEST_TESTTMPDIR/ruleset-diff.json" "Failed \`$DIFF -u \"$JDUMPFILE\" \"$NFT_TEST_TESTTMPDIR/ruleset-after.json-pretty\"\`" >> "$NFT_TEST_TESTTMPDIR/rc-failed-dump" rc_dump=1 else rm -f "$NFT_TEST_TESTTMPDIR/ruleset-diff.json" |