浏览代码

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 <github@gone.nl>
Sebastiaan van Stijn 1 年之前
父节点
当前提交
82bb3d8d2b
共有 1 个文件被更改,包括 5 次插入5 次删除
  1. 5 5
      libnetwork/firewall_linux_test.go

+ 5 - 5
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)
 			}
 		})
 	}