Browse code

Merge pull request #38553 from thaJeztah/faster_api_node_drain_pause

Slightly speed up TestAPISwarmNodeDrainPause

Brian Goff authored on 2019/01/16 06:49:28
Showing 1 changed files
... ...
@@ -79,7 +79,7 @@ func (s *DockerSwarmSuite) TestAPISwarmNodeDrainPause(c *check.C) {
79 79
 	time.Sleep(1 * time.Second) // make sure all daemons are ready to accept tasks
80 80
 
81 81
 	// start a service, expect balanced distribution
82
-	instances := 8
82
+	instances := 2
83 83
 	id := d1.CreateService(c, simpleTestService, setInstances(instances))
84 84
 
85 85
 	waitAndAssert(c, defaultReconciliationTimeout, d1.CheckActiveContainerCount, checker.GreaterThan, 0)
... ...
@@ -100,10 +100,9 @@ func (s *DockerSwarmSuite) TestAPISwarmNodeDrainPause(c *check.C) {
100 100
 
101 101
 	instances = 1
102 102
 	d1.UpdateService(c, d1.GetService(c, id), setInstances(instances))
103
-
104 103
 	waitAndAssert(c, defaultReconciliationTimeout*2, reducedCheck(sumAsIntegers, d1.CheckActiveContainerCount, d2.CheckActiveContainerCount), checker.Equals, instances)
105 104
 
106
-	instances = 8
105
+	instances = 2
107 106
 	d1.UpdateService(c, d1.GetService(c, id), setInstances(instances))
108 107
 
109 108
 	// drained node first so we don't get any old containers
... ...
@@ -118,9 +117,8 @@ func (s *DockerSwarmSuite) TestAPISwarmNodeDrainPause(c *check.C) {
118 118
 		n.Spec.Availability = swarm.NodeAvailabilityPause
119 119
 	})
120 120
 
121
-	instances = 14
121
+	instances = 4
122 122
 	d1.UpdateService(c, d1.GetService(c, id), setInstances(instances))
123
-
124 123
 	waitAndAssert(c, defaultReconciliationTimeout, d1.CheckActiveContainerCount, checker.Equals, instances-d2ContainerCount)
125 124
 	waitAndAssert(c, defaultReconciliationTimeout, d2.CheckActiveContainerCount, checker.Equals, d2ContainerCount)
126 125