beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

handle err and fix t.Skip() in ipvs/ipvs_test.go

Browse source 
Signed-off-by: fate-grand-order <chenjg@harmonycloud.cn>
This commit is contained in:
fate-grand-order 2017-02-07 14:31:11 +08:00
parent 22d136f7d5
commit 242af665c1
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libnetwork/ipvs/ipvs_test.go
View file

@ -117,7 +117,7 @@ func checkService(t *testing.T, checkPresent bool, protocol, schedMethod, servic
func TestGetFamily(t *testing.T) {
if testutils.RunningOnCircleCI() {
t.Skipf("Skipping as not supported on CIRCLE CI kernel")
t.Skip("Skipping as not supported on CIRCLE CI kernel")
}
id, err := getIPVSFamily()
@ -127,7 +127,7 @@ func TestGetFamily(t *testing.T) {
func TestService(t *testing.T) {
if testutils.RunningOnCircleCI() {
t.Skipf("Skipping as not supported on CIRCLE CI kernel")
t.Skip("Skipping as not supported on CIRCLE CI kernel")
}
defer testutils.SetupTestOSContext(t)()
@ -178,6 +178,7 @@ func TestService(t *testing.T) {
}
err = i.DelService(&s)
assert.NoError(t, err)
checkService(t, false, protocol, lastMethod, serviceAddress)
}
}
@ -186,7 +187,7 @@ func TestService(t *testing.T) {
func createDummyInterface(t *testing.T) {
if testutils.RunningOnCircleCI() {
t.Skipf("Skipping as not supported on CIRCLE CI kernel")
t.Skip("Skipping as not supported on CIRCLE CI kernel")
}
dummy := &netlink.Dummy{