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 <github@gone.nl>
| ... | ... |
@@ -69,9 +69,9 @@ func TestUserChain(t *testing.T) {
|
| 69 | 69 |
|
| 70 | 70 |
if tc.insert {
|
| 71 | 71 |
_, err = iptable4.Raw("-A", fwdChainName, "-j", "DROP")
|
| 72 |
- assert.NilError(t, err) |
|
| 72 |
+ assert.Check(t, err) |
|
| 73 | 73 |
_, err = iptable6.Raw("-A", fwdChainName, "-j", "DROP")
|
| 74 |
- assert.NilError(t, err) |
|
| 74 |
+ assert.Check(t, err) |
|
| 75 | 75 |
} |
| 76 | 76 |
arrangeUserFilterRule() |
| 77 | 77 |
|
| ... | ... |
@@ -81,10 +81,10 @@ func TestUserChain(t *testing.T) {
|
| 81 | 81 |
assert.Check(t, is.DeepEqual(getRules(t, iptable4, usrChainName), tc.userChain)) |
| 82 | 82 |
assert.Check(t, is.DeepEqual(getRules(t, iptable6, usrChainName), tc.userChain)) |
| 83 | 83 |
} else {
|
| 84 |
- _, err := iptable4.Raw("-S", usrChainName)
|
|
| 85 |
- assert.Assert(t, err != nil, "ipv4 chain %v: created unexpectedly", usrChainName) |
|
| 84 |
+ _, err = iptable4.Raw("-S", usrChainName)
|
|
| 85 |
+ assert.Check(t, is.ErrorContains(err, "No chain/target/match by that name"), "ipv4 chain %v: created unexpectedly", usrChainName) |
|
| 86 | 86 |
_, err = iptable6.Raw("-S", usrChainName)
|
| 87 |
- assert.Assert(t, err != nil, "ipv6 chain %v: created unexpectedly", usrChainName) |
|
| 87 |
+ assert.Check(t, is.ErrorContains(err, "No chain/target/match by that name"), "ipv6 chain %v: created unexpectedly", usrChainName) |
|
| 88 | 88 |
} |
| 89 | 89 |
}) |
| 90 | 90 |
} |