Merge branch 'swarm_init_add_params' of https://github.com/akiuni/aio…

…docker into swarm_init_add_params

CHANGES/323.bugfix

@@ -0,0 +1 @@
+Support additional parameters in swarm init

tests/test_swarm.py

@@ -5,11 +5,30 @@
 from aiodocker.exceptions import DockerError
 
 
+@pytest.mark.asyncio
+async def test_swarm_inspect(swarm):
+    swarm_info = await swarm.swarm.inspect()
+    assert "ID" in swarm_info
+    assert "Spec" in swarm_info
+
+
+@pytest.mark.asyncio
+async def test_swarm_failing_joining(swarm):
+    swarm_info = await swarm.swarm.inspect()
+    system_info = await swarm.system.info()
+    swarm_addr = [system_info["Swarm"]["RemoteManagers"][-1]["Addr"]]
+    token = swarm_info["JoinTokens"]["Worker"]
+    with pytest.raises(DockerError):
+        await swarm.swarm.join(join_token=token, remote_addrs=swarm_addr)
+
+
 @pytest.mark.asyncio
 async def test_swarm_init(event_loop, docker):
     if sys.platform == "win32":
         pytest.skip("swarm commands dont work on Windows")
-    default_addr_pool = ["127.1.0.0/16", "127.2.0.0/16"]
+    # Not enough rights to set that :
+    # default_addr_pool = ["10.1.0.0/16", "10.1.0.0/16"]
+    default_addr_pool = ["10.0.0.0/8"]
     data_path_port = 4788
     subnet_size = 16
     assert await docker.swarm.init(
@@ -24,20 +43,3 @@ async def test_swarm_init(event_loop, docker):
     assert swarm_inspect["DataPathPort"] == data_path_port
     assert swarm_inspect["SubnetSize"] == subnet_size
     await docker.swarm.leave(force=True)
-
-
-@pytest.mark.asyncio
-async def test_swarm_inspect(swarm):
-    swarm_info = await swarm.swarm.inspect()
-    assert "ID" in swarm_info
-    assert "Spec" in swarm_info
-
-
-@pytest.mark.asyncio
-async def test_swarm_failing_joining(swarm):
-    swarm_info = await swarm.swarm.inspect()
-    system_info = await swarm.system.info()
-    swarm_addr = [system_info["Swarm"]["RemoteManagers"][-1]["Addr"]]
-    token = swarm_info["JoinTokens"]["Worker"]
-    with pytest.raises(DockerError):
-        await swarm.swarm.join(join_token=token, remote_addrs=swarm_addr)