From 8ed0fdebe714c64aa697ed7e2187d2233e34eb22 Mon Sep 17 00:00:00 2001 From: Anda Xu Date: Tue, 29 May 2018 15:09:11 -0700 Subject: [PATCH] add api version checking for tests from new feature Signed-off-by: Anda Xu --- integration/network/service_test.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/integration/network/service_test.go b/integration/network/service_test.go index 8a92786fd8..6f6da18cd1 100644 --- a/integration/network/service_test.go +++ b/integration/network/service_test.go @@ -7,6 +7,7 @@ import ( "github.com/docker/docker/api/types" swarmtypes "github.com/docker/docker/api/types/swarm" + "github.com/docker/docker/api/types/versions" "github.com/docker/docker/client" "github.com/docker/docker/integration/internal/swarm" "github.com/docker/docker/internal/test/daemon" @@ -24,7 +25,7 @@ func delInterface(t *testing.T, ifName string) { } func TestDaemonRestartWithLiveRestore(t *testing.T) { - skip.If(t, testEnv.IsRemoteDaemon()) + skip.If(t, testEnv.IsRemoteDaemon(), versions.LessThan(testEnv.DaemonAPIVersion(), "1.38")) d := daemon.New(t) defer d.Stop(t) d.Start(t) @@ -44,7 +45,7 @@ func TestDaemonRestartWithLiveRestore(t *testing.T) { func TestDaemonDefaultNetworkPools(t *testing.T) { // Remove docker0 bridge and the start daemon defining the predefined address pools - skip.If(t, testEnv.IsRemoteDaemon()) + skip.If(t, testEnv.IsRemoteDaemon(), versions.LessThan(testEnv.DaemonAPIVersion(), "1.38")) defaultNetworkBridge := "docker0" delInterface(t, defaultNetworkBridge) d := daemon.New(t) @@ -89,7 +90,7 @@ func TestDaemonDefaultNetworkPools(t *testing.T) { } func TestDaemonRestartWithExistingNetwork(t *testing.T) { - skip.If(t, testEnv.IsRemoteDaemon()) + skip.If(t, testEnv.IsRemoteDaemon(), versions.LessThan(testEnv.DaemonAPIVersion(), "1.38")) defaultNetworkBridge := "docker0" d := daemon.New(t) d.Start(t) @@ -123,7 +124,7 @@ func TestDaemonRestartWithExistingNetwork(t *testing.T) { } func TestDaemonRestartWithExistingNetworkWithDefaultPoolRange(t *testing.T) { - skip.If(t, testEnv.IsRemoteDaemon()) + skip.If(t, testEnv.IsRemoteDaemon(), versions.LessThan(testEnv.DaemonAPIVersion(), "1.38")) defaultNetworkBridge := "docker0" d := daemon.New(t) d.Start(t) @@ -179,7 +180,7 @@ func TestDaemonRestartWithExistingNetworkWithDefaultPoolRange(t *testing.T) { } func TestDaemonWithBipAndDefaultNetworkPool(t *testing.T) { - skip.If(t, testEnv.IsRemoteDaemon()) + skip.If(t, testEnv.IsRemoteDaemon(), versions.LessThan(testEnv.DaemonAPIVersion(), "1.38")) defaultNetworkBridge := "docker0" d := daemon.New(t) defer d.Stop(t)