docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix build tests to not rely on internet connectivity 

Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2017-11-02 14:06:05 -07:00 committed by Joffrey F
parent e055729104
commit 9756a4ec4c
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tests/integration/api_build_test.py
View File

@ -8,8 +8,8 @@ from docker import errors
import pytest import pytest
import six import six
from .base import BaseAPIIntegrationTest from .base import BaseAPIIntegrationTest, BUSYBOX
from ..helpers import requires_api_version, requires_experimental from ..helpers import random_name, requires_api_version, requires_experimental
class BuildTest(BaseAPIIntegrationTest): class BuildTest(BaseAPIIntegrationTest):
@ -214,21 +214,31 @@ class BuildTest(BaseAPIIntegrationTest):
@requires_api_version('1.25') @requires_api_version('1.25')
def test_build_with_network_mode(self): def test_build_with_network_mode(self):
# Set up pingable endpoint on custom network
network = self.client.create_network(random_name())['Id']
self.tmp_networks.append(network)
container = self.client.create_container(BUSYBOX, 'top')
self.tmp_containers.append(container)
self.client.start(container)
self.client.connect_container_to_network(
container, network, aliases=['pingtarget.docker']
)
script = io.BytesIO('\n'.join([ script = io.BytesIO('\n'.join([
'FROM busybox', 'FROM busybox',
'RUN wget http://google.com' 'RUN ping -c1 pingtarget.docker'
]).encode('ascii')) ]).encode('ascii'))
stream = self.client.build( stream = self.client.build(
fileobj=script, network_mode='bridge', fileobj=script, network_mode=network,
tag='dockerpytest_bridgebuild' tag='dockerpytest_customnetbuild'
) )
self.tmp_imgs.append('dockerpytest_bridgebuild') self.tmp_imgs.append('dockerpytest_customnetbuild')
for chunk in stream: for chunk in stream:
pass print chunk
assert self.client.inspect_image('dockerpytest_bridgebuild') assert self.client.inspect_image('dockerpytest_customnetbuild')
script.seek(0) script.seek(0)
stream = self.client.build( stream = self.client.build(
@ -260,7 +270,7 @@ class BuildTest(BaseAPIIntegrationTest):
fileobj=script, tag=img_name, fileobj=script, tag=img_name,
extra_hosts={ extra_hosts={
'extrahost.local.test': '127.0.0.1', 'extrahost.local.test': '127.0.0.1',
'hello.world.test': '8.8.8.8', 'hello.world.test': '127.0.0.1',
}, decode=True }, decode=True
) )
for chunk in stream: for chunk in stream:
@ -274,7 +284,7 @@ class BuildTest(BaseAPIIntegrationTest):
if six.PY3: if six.PY3:
logs = logs.decode('utf-8') logs = logs.decode('utf-8')
assert '127.0.0.1\textrahost.local.test' in logs assert '127.0.0.1\textrahost.local.test' in logs
assert '8.8.8.8\thello.world.test' in logs assert '127.0.0.1\thello.world.test' in logs
@requires_experimental(until=None) @requires_experimental(until=None)
@requires_api_version('1.25') @requires_api_version('1.25')