jyapayne/compose
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Extract link names into a function.

Browse source 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin 2015-09-03 13:13:22 -04:00
commit db31adc208
4 changed files with 20 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/integration/project_test.py
View file

@ -112,7 +112,7 @@ class ProjectTest(DockerClientTestCase):
web = project.get_service('web')
net = project.get_service('net')
self.assertEqual(web._get_net(), 'container:' + net.containers()[0].id)
self.assertEqual(web.net.mode, 'container:' + net.containers()[0].id)
def test_net_from_container(self):
net_container = Container.create(
@ -138,7 +138,7 @@ class ProjectTest(DockerClientTestCase):
project.up()
web = project.get_service('web')
self.assertEqual(web._get_net(), 'container:' + net_container.id)
self.assertEqual(web.net.mode, 'container:' + net_container.id)
def test_start_stop_kill_remove(self):
web = self.create_service('web')

19
tests/integration/service_test.py
View file

@ -9,6 +9,7 @@ import tempfile
import shutil
from six import StringIO, text_type
from .testcases import DockerClientTestCase
from compose import __version__
from compose.const import (
LABEL_CONTAINER_NUMBER,
@ -17,14 +18,12 @@ from compose.const import (
LABEL_SERVICE,
LABEL_VERSION,
)
from compose.service import (
ConfigError,
ConvergencePlan,
Service,
build_extra_hosts,
)
from compose.container import Container
from .testcases import DockerClientTestCase
from compose.service import build_extra_hosts
from compose.service import ConfigError
from compose.service import ConvergencePlan
from compose.service import Net
from compose.service import Service
def create_and_start_container(service, **override_options):
@ -743,17 +742,17 @@ class ServiceTest(DockerClientTestCase):
self.assertEqual(list(container.inspect()['HostConfig']['PortBindings'].keys()), ['8000/tcp'])
def test_network_mode_none(self):
service = self.create_service('web', net='none')
service = self.create_service('web', net=Net('none'))
container = create_and_start_container(service)
self.assertEqual(container.get('HostConfig.NetworkMode'), 'none')
def test_network_mode_bridged(self):
service = self.create_service('web', net='bridge')
service = self.create_service('web', net=Net('bridge'))
container = create_and_start_container(service)
self.assertEqual(container.get('HostConfig.NetworkMode'), 'bridge')
def test_network_mode_host(self):
service = self.create_service('web', net='host')
service = self.create_service('web', net=Net('host'))
container = create_and_start_container(service)
self.assertEqual(container.get('HostConfig.NetworkMode'), 'host')