Tune docker commands

Author: asvetlov

requirements-dev.txt

@@ -5,7 +5,7 @@ pep257==0.7.0
 -e .
 aioredis==1.0.0
 cryptography==2.1.4
-docker-py==1.10.6
+docker==2.5.1
 pynacl==1.2.1
 pytest==3.4.0
 pytest-aiohttp==0.3.0

setup.py

@@ -15,7 +15,7 @@
 def read(f):
     return open(os.path.join(os.path.dirname(__file__), f)).read().strip()
 
-install_requires = ['aiohttp>=2.3.0']
+install_requires = ['aiohttp>=3.0.1']
 extras_require = {
     'aioredis': ['aioredis>=1.0.0'],
     'aiomcache': ['aiomcache>=0.5.2'],

tests/conftest.py

@@ -3,9 +3,10 @@
 import asyncio
 import gc
 import pytest
+import sys
 import time
 import uuid
-from docker import Client as DockerClient
+from docker import from_env as docker_from_env
 import socket
 
 
@@ -42,41 +43,45 @@ def session_id():
 
 @pytest.fixture(scope='session')
 def docker():
-    return DockerClient(version='auto')
-
-
-def pytest_addoption(parser):
-    parser.addoption("--no-pull", action="store_true", default=False,
-                     help="Don't perform docker images pulling")
+    client = docker_from_env(version='auto')
+    return client
 
 
 @pytest.fixture(scope='session')
 def redis_server(docker, session_id, loop, request):
-    if not request.config.option.no_pull:
-        docker.pull('redis:{}'.format('latest'))
 
-    container_args = dict(
-        image='redis:{}'.format('latest'),
-        name='redis-test-server-{}-{}'.format('latest', session_id),
-        ports=[6379],
-        detach=True,
-    )
+    image = 'redis:{}'.format('latest')
 
-    # bound IPs do not work on OSX
-    host = "127.0.0.1"
-    host_port = unused_port()
-    container_args['host_config'] = docker.create_host_config(
-        port_bindings={6379: (host, host_port)})
+    if sys.platform.startswith('darwin'):
+        port = unused_port()
+    else:
+        port = None
 
-    container = docker.create_container(**container_args)
+    container = docker.containers.run(
+        image=image,
+        detach=True,
+        name='redis-test-server-{}-{}'.format('latest', session_id),
+        ports={
+            '6379/tcp': port,
+        },
+        environment={
+            'http.host': '0.0.0.0',
+            'transport.host': '127.0.0.1',
+        },
+    )
 
-    docker.start(container=container['Id'])
+    if sys.platform.startswith('darwin'):
+        host = '0.0.0.0'
+    else:
+        inspection = docker.api.inspect_container(container.id)
+        host = inspection['NetworkSettings']['IPAddress']
+        port = 6379
 
-    delay = 0.001
-    for i in range(100):
+    delay = 0.1
+    for i in range(20):
         try:
             conn = loop.run_until_complete(
-                aioredis.create_connection((host, host_port), loop=loop)
+                aioredis.create_connection((host, port), loop=loop)
             )
             loop.run_until_complete(conn.execute('SET', 'foo', 'bar'))
             break
@@ -85,16 +90,18 @@ def redis_server(docker, session_id, loop, request):
             delay *= 2
     else:
         pytest.fail("Cannot start redis server")
-    container['redis_params'] = dict(address=(host, host_port))
-    yield container
 
-    docker.kill(container=container['Id'])
-    docker.remove_container(container['Id'])
+    yield {'host': host,
+           'port': port,
+           'container': container}
+
+    container.kill(signal=9)
+    container.remove(force=True)
 
 
 @pytest.fixture
 def redis_params(redis_server):
-    return dict(**redis_server['redis_params'])
+    return dict(address=(redis_server['host'], redis_server['port']))
 
 
 @pytest.fixture
@@ -118,55 +125,58 @@ async def start(*args, no_loop=False, **kwargs):
 
 @pytest.fixture(scope='session')
 def memcached_server(docker, session_id, loop, request):
-    if not request.config.option.no_pull:
-        docker.pull('memcached:{}'.format('latest'))
 
-    """
-    container = docker.create_container(
-        image='memcached:{}'.format('latest'),
-        name='memcached-test-server-{}-{}'.format('latest', session_id),
-        ports=[11211],
-        detach=True,
-    )
-    """
+    image = 'memcached:{}'.format('latest')
 
-    container_args = dict(
-        image='memcached:{}'.format('latest'),
-        name='memcached-test-server-{}-{}'.format('latest', session_id),
-        ports=[11211],
+    if sys.platform.startswith('darwin'):
+        port = unused_port()
+    else:
+        port = None
+
+    container = docker.containers.run(
+        image=image,
         detach=True,
+        name='memcached-test-server-{}-{}'.format('latest', session_id),
+        ports={
+            '11211/tcp': port,
+        },
+        environment={
+            'http.host': '0.0.0.0',
+            'transport.host': '127.0.0.1',
+        },
     )
 
-    # bound IPs do not work on OSX
-    host = "127.0.0.1"
-    host_port = unused_port()
-    container_args['host_config'] = docker.create_host_config(
-        port_bindings={11211: (host, host_port)})
-    container = docker.create_container(**container_args)
-    docker.start(container=container['Id'])
-    # inspection = docker.inspect_container(container['Id'])
-    # host = inspection['NetworkSettings']['IPAddress']
-    delay = 0.001
-    for i in range(100):
+    if sys.platform.startswith('darwin'):
+        host = '0.0.0.0'
+    else:
+        inspection = docker.api.inspect_container(container.id)
+        host = inspection['NetworkSettings']['IPAddress']
+        port = 11211
+
+    delay = 0.1
+    for i in range(20):
         try:
-            conn = aiomcache.Client(host, host_port, loop=loop)
+            conn = aiomcache.Client(host, port, loop=loop)
             loop.run_until_complete(conn.set(b'foo', b'bar'))
             break
         except ConnectionRefusedError as e:
             time.sleep(delay)
             delay *= 2
     else:
         pytest.fail("Cannot start memcached server")
-    container['memcached_params'] = dict(host=host, port=host_port)
-    yield container
 
-    docker.kill(container=container['Id'])
-    docker.remove_container(container['Id'])
+    yield {'host': host,
+           'port': port,
+           'container': container}
+
+    container.kill(signal=9)
+    container.remove(force=True)
 
 
 @pytest.fixture
 def memcached_params(memcached_server):
-    return dict(**memcached_server['memcached_params'])
+    return dict(host=memcached_server['host'],
+                port=memcached_server['port'])
 
 
 @pytest.fixture