kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #39430 from thaJeztah/ipvlan_checks_cleanup 

Integration: remove redundant checks in IPVLAN tests
This commit is contained in:
Sebastiaan van Stijn 2019-07-13 13:27:59 +02:00 committed by GitHub
parent 47a84dcc64 4060a7026c
commit cfac0c9c49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
integration/network/ipvlan/ipvlan_test.go
View File

@ -1,6 +1,6 @@
// +build !windows
package ipvlan
package ipvlan // import "github.com/docker/docker/integration/network/ipvlan"
import (
"context"
@ -22,11 +22,10 @@ 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")
d := daemon.New(t, daemon.WithExperimental)
d := daemon.New(t)
d.StartWithBusybox(t)
defer d.Stop(t)
@ -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")
@ -87,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)

2
integration/network/ipvlan/main_test.go
View File

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

1
integration/network/ipvlan/main_windows_test.go Normal file
View File

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