docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Temporarily skip flaky part of the drain test
This commit is contained in:
Tibor Vass 2016-06-14 10:56:03 -07:00 committed by GitHub
parent 81a85cf448 499e3a45b1
commit f0e8952669
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
daemon/cluster/cluster.go
View File

@ -28,7 +28,7 @@ import (
const swarmDirName = "swarm" const swarmDirName = "swarm"
const controlSocket = "control.sock" const controlSocket = "control.sock"
const swarmConnectTimeout = 5 * time.Second const swarmConnectTimeout = 10 * time.Second
const stateFile = "docker-state.json" const stateFile = "docker-state.json"
const ( const (

2
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 n.Spec.Availability = swarm.NodeAvailabilityPause
}) })
c.Skip("known flakiness with scaling up from this state")
instances = 14 instances = 14
d1.updateService(c, d1.getService(c, id), setInstances(instances)) d1.updateService(c, d1.getService(c, id), setInstances(instances))