docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-19 21:41:31 +03:00
Code Activity

Merge pull request #23526 from tonistiigi/skip-drain-test

Browse Source 
Temporarily skip flaky part of the drain test
Upstream-commit: f0e89526698de9bc7b081a91c0cfb8390326a0cb
Component: engine
This commit is contained in:
Tibor Vass
2016-06-14 10:56:03 -07:00
committed by GitHub
parent 4493a22384 fd56910b10
commit 8a4b73bd5c
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/daemon/cluster/cluster.go
View File

@@ -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 (

2
components/engine/integration-cli/docker_api_swarm_test.go
View File

@@ -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))