diff --git a/integration/network/macvlan/macvlan_test.go b/integration/network/macvlan/macvlan_test.go index cb1f70a78f..b734cad82e 100644 --- a/integration/network/macvlan/macvlan_test.go +++ b/integration/network/macvlan/macvlan_test.go @@ -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) -} diff --git a/integration/network/macvlan/main_test.go b/integration/network/macvlan/main_test.go index 31cf111b22..15bdc323b5 100644 --- a/integration/network/macvlan/main_test.go +++ b/integration/network/macvlan/main_test.go @@ -1,3 +1,5 @@ +// +build !windows + package macvlan // import "github.com/docker/docker/integration/network/macvlan" import ( diff --git a/integration/network/macvlan/main_windows_test.go b/integration/network/macvlan/main_windows_test.go new file mode 100644 index 0000000000..367cd2c540 --- /dev/null +++ b/integration/network/macvlan/main_windows_test.go @@ -0,0 +1 @@ +package macvlan // import "github.com/docker/docker/integration/network/macvlan"