From 8c5f98c93e06de81b7fb6416372a3f42aa7aeb5d Mon Sep 17 00:00:00 2001
From: Christopher Crone <christopher.crone@docker.com>
Date: Mon, 25 Sep 2017 14:09:17 +0200
Subject: [PATCH] Docker EE integration test fixes
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
---
internal/test/environment/clean.go | 16 +++++++++++++++-
internal/test/environment/protect.go | 5 +++++
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/internal/test/environment/clean.go b/internal/test/environment/clean.go
index 1bdd21080a..e9548d1cde 100644
--- a/internal/test/environment/clean.go
+++ b/internal/test/environment/clean.go
@@ -81,7 +81,7 @@ func deleteAllContainers(t assert.TestingT, apiclient client.ContainerAPIClient,
Force: true,
RemoveVolumes: true,
})
- if err == nil || client.IsErrNotFound(err) || alreadyExists.MatchString(err.Error()) {
+ if err == nil || client.IsErrNotFound(err) || alreadyExists.MatchString(err.Error()) || isErrNotFoundSwarmClassic(err) {
continue
}
assert.NoError(t, err, "failed to remove %s", container.ID)
@@ -138,6 +138,10 @@ func deleteAllVolumes(t assert.TestingT, c client.VolumeAPIClient, protectedVolu
continue
}
err := c.VolumeRemove(context.Background(), v.Name, true)
+ // Docker EE may list volumes that no longer exist.
+ if isErrNotFoundSwarmClassic(err) {
+ continue
+ }
assert.NoError(t, err, "failed to remove volume %s", v.Name)
}
}
@@ -164,6 +168,10 @@ func deleteAllNetworks(t assert.TestingT, c client.NetworkAPIClient, daemonPlatf
func deleteAllPlugins(t assert.TestingT, c client.PluginAPIClient, protectedPlugins map[string]struct{}) {
plugins, err := c.PluginList(context.Background(), filters.Args{})
+ // Docker EE does not allow cluster-wide plugin management.
+ if client.IsErrNotImplemented(err) {
+ return
+ }
assert.NoError(t, err, "failed to list plugins")
for _, p := range plugins {
@@ -174,3 +182,9 @@ func deleteAllPlugins(t assert.TestingT, c client.PluginAPIClient, protectedPlug
assert.NoError(t, err, "failed to remove plugin %s", p.ID)
}
}
+
+// Swarm classic aggregates node errors and returns a 500 so we need to check
+// the error string instead of just IsErrNotFound().
+func isErrNotFoundSwarmClassic(err error) bool {
+ return err != nil && strings.Contains(strings.ToLower(err.Error()), "no such")
+}
diff --git a/internal/test/environment/protect.go b/internal/test/environment/protect.go
index 3c74fcf1bb..296ae73789 100644
--- a/internal/test/environment/protect.go
+++ b/internal/test/environment/protect.go
@@ -5,6 +5,7 @@ import (
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/filters"
+ dclient "github.com/docker/docker/client"
"github.com/docker/docker/integration-cli/fixtures/load"
"github.com/stretchr/testify/require"
)
@@ -172,6 +173,10 @@ func ProtectPlugins(t testingT, testEnv *Execution) {
func getExistingPlugins(t require.TestingT, testEnv *Execution) []string {
client := testEnv.APIClient()
pluginList, err := client.PluginList(context.Background(), filters.Args{})
+ // Docker EE does not allow cluster-wide plugin management.
+ if dclient.IsErrNotImplemented(err) {
+ return []string{}
+ }
require.NoError(t, err, "failed to list plugins")
plugins := []string{}