kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

integration-cli/Test*Swarm*: use same args on restart

Browse source 
When starting docker daemons for swarm testing, we disable iptables
and use lo for communication (in order to avoid network conflicts).

The problem is, these options are lost on restart, that can lead
to any sorts of network conflicts and thus connectivity issues
between swarm nodes.

Fix this. This does not fix issues with swarm test failures, but
it seems they appear are less often after this one.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
Kir Kolyshkin 2018-10-25 11:47:56 -07:00
parent 06afc2d1e6
commit 2ed512c7fa
5 changed files with 49 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

2
integration-cli/docker_api_swarm_node_test.go
View file

@ -62,7 +62,7 @@ func (s *DockerSwarmSuite) TestAPISwarmNodeRemove(c *check.C) {
c.Assert(len(nodes), checker.Equals, 2, check.Commentf("nodes: %#v", nodes))
// Restart the node that was removed
d2.Restart(c)
d2.RestartNode(c)
// Give some time for the node to rejoin
time.Sleep(1 * time.Second)