Browse code

Merge pull request #28266 from tonistiigi/fix-service-update-test

Fix flaky TestServiceUpdateSecrets

Evan Hazlett authored on 2016/11/11 15:17:29
Showing 1 changed files
... ...
@@ -104,7 +104,7 @@ func (s *DockerSwarmSuite) TestServiceUpdateSecrets(c *check.C) {
104 104
 	c.Assert(err, checker.IsNil, check.Commentf(out))
105 105
 
106 106
 	// add secret
107
-	out, err = d.Cmd("service", "update", "test", "--secret-add", fmt.Sprintf("source=%s,target=%s", testName, testTarget))
107
+	out, err = d.cmdRetryOutOfSequence("service", "update", "test", "--secret-add", fmt.Sprintf("source=%s,target=%s", testName, testTarget))
108 108
 	c.Assert(err, checker.IsNil, check.Commentf(out))
109 109
 
110 110
 	out, err = d.Cmd("service", "inspect", "--format", "{{ json .Spec.TaskTemplate.ContainerSpec.Secrets }}", serviceName)
... ...
@@ -119,7 +119,7 @@ func (s *DockerSwarmSuite) TestServiceUpdateSecrets(c *check.C) {
119 119
 	c.Assert(refs[0].Target.Name, checker.Equals, testTarget)
120 120
 
121 121
 	// remove
122
-	out, err = d.Cmd("service", "update", "test", "--secret-rm", testName)
122
+	out, err = d.cmdRetryOutOfSequence("service", "update", "test", "--secret-rm", testName)
123 123
 	c.Assert(err, checker.IsNil, check.Commentf(out))
124 124
 
125 125
 	out, err = d.Cmd("service", "inspect", "--format", "{{ json .Spec.TaskTemplate.ContainerSpec.Secrets }}", serviceName)