diff options
| author | Phil Sutter <phil@nwl.cc> | 2023-09-01 13:16:56 +0200 |
|---|---|---|
| committer | Phil Sutter <phil@nwl.cc> | 2023-09-14 12:20:11 +0200 |
| commit | ea12b1d2b191f100a6fdb83af4681364e4dba12a (patch) | |
| tree | 89b21b7fce1121111aa331cc422ef1570d0cf12d | |
| parent | 2e704f6ddd6d056e360f3d9c11e8b6c56a20cf23 (diff) | |
tests: shell: Fix for ineffective 0007-mid-restore-flush_0
The test did not catch non-zero exit status of the spawned coprocess. To
make it happen, Drop the line killing it (it will exit anyway) and pass
its PID to 'wait'.
While being at it, put the sleep into the correct spot (otherwise the
check for chain 'foo' existence fails as it runs too early) and make
said chain existence check effective.
Fixes: 4e3c11a6f5a94 ("nft: Fix for ruleset flush while restoring")
Signed-off-by: Phil Sutter <phil@nwl.cc>
| -rwxr-xr-x | iptables/tests/shell/testcases/nft-only/0007-mid-restore-flush_0 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/iptables/tests/shell/testcases/nft-only/0007-mid-restore-flush_0 b/iptables/tests/shell/testcases/nft-only/0007-mid-restore-flush_0 index 43880ffb..981f007f 100755 --- a/iptables/tests/shell/testcases/nft-only/0007-mid-restore-flush_0 +++ b/iptables/tests/shell/testcases/nft-only/0007-mid-restore-flush_0 @@ -13,11 +13,11 @@ COMMIT :foo [0:0] EOF -$XT_MULTI iptables-save | grep -q ':foo' +sleep 1 +$XT_MULTI iptables-save | grep -q ':foo' || exit 1 nft flush ruleset echo "COMMIT" >&"${COPROC[1]}" -sleep 1 - -[[ -n $COPROC_PID ]] && kill $COPROC_PID -wait +# close the pipe to make iptables-restore exit if it didn't error out yet +eval "exec ${COPROC[1]}>&-" +wait $COPROC_PID |