Browse code

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

Temporarily skip flaky part of the drain test

Tibor Vass authored on 2016/06/15 02:56:03
Showing 2 changed files
... ...
@@ -28,7 +28,7 @@ import (
28 28
 
29 29
 const swarmDirName = "swarm"
30 30
 const controlSocket = "control.sock"
31
-const swarmConnectTimeout = 5 * time.Second
31
+const swarmConnectTimeout = 10 * time.Second
32 32
 const stateFile = "docker-state.json"
33 33
 
34 34
 const (
... ...
@@ -453,6 +453,8 @@ func (s *DockerSwarmSuite) TestApiSwarmNodeDrainPause(c *check.C) {
453 453
 		n.Spec.Availability = swarm.NodeAvailabilityPause
454 454
 	})
455 455
 
456
+	c.Skip("known flakiness with scaling up from this state")
457
+
456 458
 	instances = 14
457 459
 	d1.updateService(c, d1.getService(c, id), setInstances(instances))
458 460