kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request from fate-grand-order/branch-1

Browse source 
handle err and fix t.Skip() in ipvs/ipvs_test.go
This commit is contained in:
Alessandro Boch 2017-02-13 13:56:12 -08:00 • committed by GitHub
commit 9385063b84
1 changed files with 4 additions and 3 deletions

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{