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 #39431 from thaJeztah/macvlan_redundant_checks

Browse source 
Integration: remove redundant kernel version check for MACVlan
This commit is contained in:
Sebastiaan van Stijn 2019-07-15 11:33:15 +02:00 committed by GitHub
commit 6359da4afa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
integration/network/macvlan/macvlan_test.go
View file

@ -1,6 +1,6 @@
// +build !windows
package macvlan
package macvlan // import "github.com/docker/docker/integration/network/macvlan"
import (
"context"
@ -20,7 +20,6 @@ import (
func TestDockerNetworkMacvlanPersistance(t *testing.T) {
// verify the driver automatically provisions the 802.1q link (dm-dummy0.60)
skip.If(t, testEnv.IsRemoteDaemon)
skip.If(t, !macvlanKernelSupport(), "Kernel doesn't support macvlan")
d := daemon.New(t)
d.StartWithBusybox(t)
@ -43,7 +42,6 @@ func TestDockerNetworkMacvlanPersistance(t *testing.T) {
func TestDockerNetworkMacvlan(t *testing.T) {
skip.If(t, testEnv.IsRemoteDaemon)
skip.If(t, !macvlanKernelSupport(), "Kernel doesn't support macvlan")
for _, tc := range []struct {
name string
@ -271,8 +269,3 @@ func testMacvlanAddressing(client client.APIClient) func(*testing.T) {
assert.Check(t, strings.Contains(result.Combined(), "default via 2001:db8:abca::254 dev eth0"))
}
}
// ensure Kernel version is >= v3.9 for macvlan support
func macvlanKernelSupport() bool {
return n.CheckKernelMajorVersionGreaterOrEqualThen(3, 9)
}

2
integration/network/macvlan/main_test.go
View file

@ -1,3 +1,5 @@
// +build !windows
package macvlan // import "github.com/docker/docker/integration/network/macvlan"
import (

1
integration/network/macvlan/main_windows_test.go Normal file
View file

@ -0,0 +1 @@
package macvlan // import "github.com/docker/docker/integration/network/macvlan"