diff options
| author | Tibor Vass <tiborvass@users.noreply.github.com> | 2016-06-14 10:56:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-14 10:56:03 -0700 |
| commit | f0e89526698de9bc7b081a91c0cfb8390326a0cb (patch) | |
| tree | efc78e134b45a230f209c1a5caee7dbcec9b1c85 | |
| parent | 81a85cf4481d804df59ba7aa7ecb0df5f7f9e008 (diff) | |
| parent | 499e3a45b17eff6d52abe6ba9063fe365415cf08 (diff) | |
| download | docker-f0e89526698de9bc7b081a91c0cfb8390326a0cb.tar.gz | |
Merge pull request #23526 from tonistiigi/skip-drain-test
Temporarily skip flaky part of the drain test
| -rw-r--r-- | daemon/cluster/cluster.go | 2 | ||||
| -rw-r--r-- | integration-cli/docker_api_swarm_test.go | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/daemon/cluster/cluster.go b/daemon/cluster/cluster.go index 1746e9b2cf..a83c2e5d14 100644 --- a/daemon/cluster/cluster.go +++ b/daemon/cluster/cluster.go @@ -28,7 +28,7 @@ import ( const swarmDirName = "swarm" const controlSocket = "control.sock" -const swarmConnectTimeout = 5 * time.Second +const swarmConnectTimeout = 10 * time.Second const stateFile = "docker-state.json" const ( diff --git a/integration-cli/docker_api_swarm_test.go b/integration-cli/docker_api_swarm_test.go index 4d85803f84..71465dda77 100644 --- a/integration-cli/docker_api_swarm_test.go +++ b/integration-cli/docker_api_swarm_test.go @@ -453,6 +453,8 @@ func (s *DockerSwarmSuite) TestApiSwarmNodeDrainPause(c *check.C) { n.Spec.Availability = swarm.NodeAvailabilityPause }) + c.Skip("known flakiness with scaling up from this state") + instances = 14 d1.updateService(c, d1.getService(c, id), setInstances(instances)) |