From 82bb3d8d2b51f64dbf6a4c2096bf3e10820450f0 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sun, 16 Jul 2023 18:10:28 +0200 Subject: [PATCH] libnetwork: TestUserChain: use assert.Check and is.ErrorContains Don't fail early if we can still test more, and be slightly more strict in what error we're looking for. Signed-off-by: Sebastiaan van Stijn --- libnetwork/firewall_linux_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libnetwork/firewall_linux_test.go b/libnetwork/firewall_linux_test.go index c33146a8f0..aeae505114 100644 --- a/libnetwork/firewall_linux_test.go +++ b/libnetwork/firewall_linux_test.go @@ -69,9 +69,9 @@ func TestUserChain(t *testing.T) { if tc.insert { _, err = iptable4.Raw("-A", fwdChainName, "-j", "DROP") - assert.NilError(t, err) + assert.Check(t, err) _, err = iptable6.Raw("-A", fwdChainName, "-j", "DROP") - assert.NilError(t, err) + assert.Check(t, err) } arrangeUserFilterRule() @@ -81,10 +81,10 @@ func TestUserChain(t *testing.T) { assert.Check(t, is.DeepEqual(getRules(t, iptable4, usrChainName), tc.userChain)) assert.Check(t, is.DeepEqual(getRules(t, iptable6, usrChainName), tc.userChain)) } else { - _, err := iptable4.Raw("-S", usrChainName) - assert.Assert(t, err != nil, "ipv4 chain %v: created unexpectedly", usrChainName) + _, err = iptable4.Raw("-S", usrChainName) + assert.Check(t, is.ErrorContains(err, "No chain/target/match by that name"), "ipv4 chain %v: created unexpectedly", usrChainName) _, err = iptable6.Raw("-S", usrChainName) - assert.Assert(t, err != nil, "ipv6 chain %v: created unexpectedly", usrChainName) + assert.Check(t, is.ErrorContains(err, "No chain/target/match by that name"), "ipv6 chain %v: created unexpectedly", usrChainName) } }) }