diff --git a/integration/container/daemon_linux_test.go b/integration/container/daemon_linux_test.go index 36866a3087..a676410690 100644 --- a/integration/container/daemon_linux_test.go +++ b/integration/container/daemon_linux_test.go @@ -29,7 +29,6 @@ import ( func TestContainerStartOnDaemonRestart(t *testing.T) { skip.If(t, testEnv.IsRemoteDaemon, "cannot start daemon on remote test run") skip.If(t, testEnv.DaemonInfo.OSType == "windows") - skip.If(t, testEnv.IsRemoteDaemon(), "cannot start daemon on remote test run") t.Parallel() d := daemon.New(t) diff --git a/integration/container/export_test.go b/integration/container/export_test.go index 5ad8f9226a..6727a67edc 100644 --- a/integration/container/export_test.go +++ b/integration/container/export_test.go @@ -58,7 +58,7 @@ func TestExportContainerAndImportImage(t *testing.T) { // condition, daemon restart is needed after container creation. func TestExportContainerAfterDaemonRestart(t *testing.T) { skip.If(t, testEnv.DaemonInfo.OSType == "windows") - skip.If(t, testEnv.IsRemoteDaemon()) + skip.If(t, testEnv.IsRemoteDaemon) d := daemon.New(t) c := d.NewClientT(t) diff --git a/integration/container/links_linux_test.go b/integration/container/links_linux_test.go index df05fee691..9a3c9d2719 100644 --- a/integration/container/links_linux_test.go +++ b/integration/container/links_linux_test.go @@ -15,7 +15,7 @@ import ( ) func TestLinksEtcHostsContentMatch(t *testing.T) { - skip.If(t, testEnv.IsRemoteDaemon()) + skip.If(t, testEnv.IsRemoteDaemon) hosts, err := ioutil.ReadFile("/etc/hosts") skip.If(t, os.IsNotExist(err)) diff --git a/integration/container/logs_test.go b/integration/container/logs_test.go index cc932df22d..0a3e83113a 100644 --- a/integration/container/logs_test.go +++ b/integration/container/logs_test.go @@ -16,7 +16,7 @@ import ( // Makes sure that when following we don't get an EOF error when there are no logs func TestLogsFollowTailEmpty(t *testing.T) { // FIXME(vdemeester) fails on a e2e run on linux... - skip.If(t, testEnv.IsRemoteDaemon()) + skip.If(t, testEnv.IsRemoteDaemon) defer setupTest(t)() client := testEnv.APIClient() ctx := context.Background() diff --git a/integration/container/nat_test.go b/integration/container/nat_test.go index f920081837..3e8144615c 100644 --- a/integration/container/nat_test.go +++ b/integration/container/nat_test.go @@ -22,7 +22,7 @@ import ( func TestNetworkNat(t *testing.T) { skip.If(t, testEnv.OSType == "windows", "FIXME") - skip.If(t, testEnv.IsRemoteDaemon()) + skip.If(t, testEnv.IsRemoteDaemon) defer setupTest(t)() @@ -41,7 +41,7 @@ func TestNetworkNat(t *testing.T) { func TestNetworkLocalhostTCPNat(t *testing.T) { skip.If(t, testEnv.DaemonInfo.OSType == "windows", "FIXME") - skip.If(t, testEnv.IsRemoteDaemon()) + skip.If(t, testEnv.IsRemoteDaemon) defer setupTest(t)() @@ -59,7 +59,7 @@ func TestNetworkLocalhostTCPNat(t *testing.T) { func TestNetworkLoopbackNat(t *testing.T) { skip.If(t, testEnv.OSType == "windows", "FIXME") - skip.If(t, testEnv.IsRemoteDaemon()) + skip.If(t, testEnv.IsRemoteDaemon) defer setupTest(t)() diff --git a/integration/container/remove_test.go b/integration/container/remove_test.go index e049674781..027c92001e 100644 --- a/integration/container/remove_test.go +++ b/integration/container/remove_test.go @@ -25,7 +25,7 @@ func getPrefixAndSlashFromDaemonPlatform() (prefix, slash string) { // Test case for #5244: `docker rm` fails if bind dir doesn't exist anymore func TestRemoveContainerWithRemovedVolume(t *testing.T) { - skip.If(t, testEnv.IsRemoteDaemon()) + skip.If(t, testEnv.IsRemoteDaemon) defer setupTest(t)() ctx := context.Background() diff --git a/integration/container/rename_test.go b/integration/container/rename_test.go index 9cb54ef30c..25474a7cb9 100644 --- a/integration/container/rename_test.go +++ b/integration/container/rename_test.go @@ -190,7 +190,7 @@ func TestRenameContainerWithSameName(t *testing.T) { // of the linked container should be updated so that the other // container could still reference to the container that is renamed. func TestRenameContainerWithLinkedContainer(t *testing.T) { - skip.If(t, testEnv.IsRemoteDaemon()) + skip.If(t, testEnv.IsRemoteDaemon) skip.If(t, testEnv.OSType == "windows", "FIXME") defer setupTest(t)() diff --git a/integration/network/ipvlan/ipvlan_test.go b/integration/network/ipvlan/ipvlan_test.go index b2571cfaa4..9b98ace41d 100644 --- a/integration/network/ipvlan/ipvlan_test.go +++ b/integration/network/ipvlan/ipvlan_test.go @@ -20,7 +20,7 @@ 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, testEnv.IsRemoteDaemon) skip.If(t, !ipvlanKernelSupport(), "Kernel doesn't support ipvlan") d := daemon.New(t, daemon.WithExperimental) @@ -48,7 +48,7 @@ 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, testEnv.IsRemoteDaemon) skip.If(t, !ipvlanKernelSupport(), "Kernel doesn't support ipvlan") for _, tc := range []struct { diff --git a/integration/network/macvlan/macvlan_test.go b/integration/network/macvlan/macvlan_test.go index 04b99ca1df..164dc4d0db 100644 --- a/integration/network/macvlan/macvlan_test.go +++ b/integration/network/macvlan/macvlan_test.go @@ -19,7 +19,7 @@ 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, testEnv.IsRemoteDaemon) skip.If(t, !macvlanKernelSupport(), "Kernel doesn't support macvlan") d := daemon.New(t) @@ -42,7 +42,7 @@ func TestDockerNetworkMacvlanPersistance(t *testing.T) { } func TestDockerNetworkMacvlan(t *testing.T) { - skip.If(t, testEnv.IsRemoteDaemon()) + skip.If(t, testEnv.IsRemoteDaemon) skip.If(t, !macvlanKernelSupport(), "Kernel doesn't support macvlan") for _, tc := range []struct { diff --git a/integration/network/service_test.go b/integration/network/service_test.go index 3ea0890678..c418b2eee5 100644 --- a/integration/network/service_test.go +++ b/integration/network/service_test.go @@ -27,7 +27,7 @@ func delInterface(t *testing.T, ifName string) { func TestDaemonRestartWithLiveRestore(t *testing.T) { skip.If(t, testEnv.OSType == "windows") - skip.If(t, testEnv.IsRemoteDaemon()) + skip.If(t, testEnv.IsRemoteDaemon) skip.If(t, versions.LessThan(testEnv.DaemonAPIVersion(), "1.38"), "skip test from new feature") d := daemon.New(t) defer d.Stop(t) @@ -50,7 +50,7 @@ func TestDaemonRestartWithLiveRestore(t *testing.T) { func TestDaemonDefaultNetworkPools(t *testing.T) { skip.If(t, testEnv.OSType == "windows") // Remove docker0 bridge and the start daemon defining the predefined address pools - skip.If(t, testEnv.IsRemoteDaemon()) + skip.If(t, testEnv.IsRemoteDaemon) skip.If(t, versions.LessThan(testEnv.DaemonAPIVersion(), "1.38"), "skip test from new feature") defaultNetworkBridge := "docker0" delInterface(t, defaultNetworkBridge) @@ -92,7 +92,7 @@ func TestDaemonDefaultNetworkPools(t *testing.T) { func TestDaemonRestartWithExistingNetwork(t *testing.T) { skip.If(t, testEnv.OSType == "windows") - skip.If(t, testEnv.IsRemoteDaemon()) + skip.If(t, testEnv.IsRemoteDaemon) skip.If(t, versions.LessThan(testEnv.DaemonAPIVersion(), "1.38"), "skip test from new feature") defaultNetworkBridge := "docker0" d := daemon.New(t) @@ -125,7 +125,7 @@ func TestDaemonRestartWithExistingNetwork(t *testing.T) { func TestDaemonRestartWithExistingNetworkWithDefaultPoolRange(t *testing.T) { skip.If(t, testEnv.OSType == "windows") - skip.If(t, testEnv.IsRemoteDaemon()) + skip.If(t, testEnv.IsRemoteDaemon) skip.If(t, versions.LessThan(testEnv.DaemonAPIVersion(), "1.38"), "skip test from new feature") defaultNetworkBridge := "docker0" d := daemon.New(t) @@ -175,7 +175,7 @@ func TestDaemonRestartWithExistingNetworkWithDefaultPoolRange(t *testing.T) { func TestDaemonWithBipAndDefaultNetworkPool(t *testing.T) { skip.If(t, testEnv.OSType == "windows") - skip.If(t, testEnv.IsRemoteDaemon()) + skip.If(t, testEnv.IsRemoteDaemon) skip.If(t, versions.LessThan(testEnv.DaemonAPIVersion(), "1.38"), "skip test from new feature") defaultNetworkBridge := "docker0" d := daemon.New(t) diff --git a/integration/plugin/logging/logging_linux_test.go b/integration/plugin/logging/logging_linux_test.go index 3921fa6e69..eadc524503 100644 --- a/integration/plugin/logging/logging_linux_test.go +++ b/integration/plugin/logging/logging_linux_test.go @@ -16,7 +16,7 @@ import ( ) func TestContinueAfterPluginCrash(t *testing.T) { - skip.If(t, testEnv.IsRemoteDaemon(), "test requires daemon on the same host") + skip.If(t, testEnv.IsRemoteDaemon, "test requires daemon on the same host") t.Parallel() d := daemon.New(t) diff --git a/integration/service/inspect_test.go b/integration/service/inspect_test.go index 33e90938bd..c79751f930 100644 --- a/integration/service/inspect_test.go +++ b/integration/service/inspect_test.go @@ -19,7 +19,7 @@ import ( ) func TestInspect(t *testing.T) { - skip.If(t, testEnv.IsRemoteDaemon()) + skip.If(t, testEnv.IsRemoteDaemon) skip.If(t, testEnv.DaemonInfo.OSType == "windows") defer setupTest(t)() d := swarm.NewSwarm(t, testEnv)