2d9c640d4f
If no restart delay is specified for a swarm service, the default restart delay is 5 seconds. This is a reasonable value for actual deployments - one example of where it's useful is that if a bad image is specified, the orchestrator will wait 5 seconds between attempts to restart it instead of restarting it in a tight loop. In integration tests, this 5 second delay is dead time. The tests run faster if the delay is reduced. Set it to 100 ms to avoid the waste of time. This appears to speed up a few tests: DockerSwarmSuite.TestApiSwarmForceNewCluster 37.241s -> 34.323s DockerSwarmSuite.TestApiSwarmRestartCluster 22.038s -> 15.545s DockerSwarmSuite.TestApiSwarmServicesMultipleAgents 24.456s -> 19.853s DockerSwarmSuite.TestApiSwarmServicesStateReporting 19.240s -> 10.049s ...a small step towards making the Swarm integration tests run in a reasonable amount of time. Also, change the update delay for the rolling update test from 8 seconds to 4 seconds, which should be sufficient to differentiate between batches of updated tasks. This reduces the runtime for DockerSwarmSuite.TestApiSwarmServicesUpdate from 28s to 20s. Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com> Upstream-commit: c93c6492589504ed9474922f7c98f9ecb24df77f Component: engine