From 1e4bd2623a37b8083a7c5f8a93068be2c63f491c Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 28 Jun 2019 11:31:03 +0200 Subject: [PATCH 1/4] Integration: remove unneeded platform check for IPVLAN tests These tests require a local daemon, and are not built on Windows Signed-off-by: Sebastiaan van Stijn --- integration/network/ipvlan/ipvlan_test.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/integration/network/ipvlan/ipvlan_test.go b/integration/network/ipvlan/ipvlan_test.go index a02b0db2a6..569a4b7db9 100644 --- a/integration/network/ipvlan/ipvlan_test.go +++ b/integration/network/ipvlan/ipvlan_test.go @@ -22,7 +22,6 @@ import ( func TestDockerNetworkIpvlanPersistance(t *testing.T) { // verify the driver automatically provisions the 802.1q link (di-dummy0.70) - skip.If(t, testEnv.DaemonInfo.OSType == "windows") skip.If(t, testEnv.IsRemoteDaemon) skip.If(t, !ipvlanKernelSupport(t), "Kernel doesn't support ipvlan") @@ -50,7 +49,6 @@ func TestDockerNetworkIpvlanPersistance(t *testing.T) { } func TestDockerNetworkIpvlan(t *testing.T) { - skip.If(t, testEnv.DaemonInfo.OSType == "windows") skip.If(t, testEnv.IsRemoteDaemon) skip.If(t, !ipvlanKernelSupport(t), "Kernel doesn't support ipvlan") From dae9bac6757af3027b06a983b8448ffa962cc071 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 28 Jun 2019 11:36:09 +0200 Subject: [PATCH 2/4] Integration: remove "experimental" option for IPVLAN test-daemons IPVLAN no longer is experimental since 3ab093d5670e8d59f6ae0c4604b8fcabf1582854, so there's no need to set this option. Signed-off-by: Sebastiaan van Stijn --- integration/network/ipvlan/ipvlan_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/integration/network/ipvlan/ipvlan_test.go b/integration/network/ipvlan/ipvlan_test.go index 569a4b7db9..1fea14338d 100644 --- a/integration/network/ipvlan/ipvlan_test.go +++ b/integration/network/ipvlan/ipvlan_test.go @@ -25,7 +25,7 @@ func TestDockerNetworkIpvlanPersistance(t *testing.T) { skip.If(t, testEnv.IsRemoteDaemon) skip.If(t, !ipvlanKernelSupport(t), "Kernel doesn't support ipvlan") - d := daemon.New(t, daemon.WithExperimental) + d := daemon.New(t) d.StartWithBusybox(t) defer d.Stop(t) @@ -85,7 +85,7 @@ func TestDockerNetworkIpvlan(t *testing.T) { test: testIpvlanAddressing, }, } { - d := daemon.New(t, daemon.WithExperimental) + d := daemon.New(t) d.StartWithBusybox(t) c := d.NewClientT(t) From 93b28677bffcdaf299969c4ff1603b7d07b45fbc Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 28 Jun 2019 12:01:53 +0200 Subject: [PATCH 3/4] Integration: IPVlan add missing import comment Signed-off-by: Sebastiaan van Stijn --- integration/network/ipvlan/ipvlan_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration/network/ipvlan/ipvlan_test.go b/integration/network/ipvlan/ipvlan_test.go index 1fea14338d..e8cfb14d6e 100644 --- a/integration/network/ipvlan/ipvlan_test.go +++ b/integration/network/ipvlan/ipvlan_test.go @@ -1,6 +1,6 @@ // +build !windows -package ipvlan +package ipvlan // import "github.com/docker/docker/integration/network/ipvlan" import ( "context" From 4060a7026c0ffa2983ab1fa41d43da4937ef63c6 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 11 Jul 2019 10:10:37 +0200 Subject: [PATCH 4/4] Integration: exclude IPVlan test-suite on Windows Signed-off-by: Sebastiaan van Stijn --- integration/network/ipvlan/main_test.go | 2 ++ integration/network/ipvlan/main_windows_test.go | 1 + 2 files changed, 3 insertions(+) create mode 100644 integration/network/ipvlan/main_windows_test.go diff --git a/integration/network/ipvlan/main_test.go b/integration/network/ipvlan/main_test.go index 2d5f62453c..0936647959 100644 --- a/integration/network/ipvlan/main_test.go +++ b/integration/network/ipvlan/main_test.go @@ -1,3 +1,5 @@ +// +build !windows + package ipvlan // import "github.com/docker/docker/integration/network/ipvlan" import ( diff --git a/integration/network/ipvlan/main_windows_test.go b/integration/network/ipvlan/main_windows_test.go new file mode 100644 index 0000000000..d016a04b66 --- /dev/null +++ b/integration/network/ipvlan/main_windows_test.go @@ -0,0 +1 @@ +package ipvlan // import "github.com/docker/docker/integration/network/ipvlan"