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

Fix "name is reserved" with Engine 1.10 RC1

Browse source 
Ensure link aliases are unique (this deduping was previously performed
on the server).

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
This commit is contained in:
Aanand Prasad 2016-01-19 11:27:27 +00:00
commit 2106481c23
2 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/integration/service_test.py
View file

@ -7,7 +7,6 @@ import tempfile
from os import path
from docker.errors import APIError
from pytest import mark
from six import StringIO
from six import text_type
@ -372,7 +371,6 @@ class ServiceTest(DockerClientTestCase):
create_and_start_container(db)
self.assertEqual(db.containers()[0].environment['FOO'], 'BAR')
@mark.skipif(True, reason="Engine returns error - needs investigating")
def test_start_container_creates_links(self):
db = self.create_service('db')
web = self.create_service('web', links=[(db, None)])
@ -389,7 +387,6 @@ class ServiceTest(DockerClientTestCase):
'db'])
)
@mark.skipif(True, reason="Engine returns error - needs investigating")
def test_start_container_creates_links_with_names(self):
db = self.create_service('db')
web = self.create_service('web', links=[(db, 'custom_link_name')])
@ -433,7 +430,6 @@ class ServiceTest(DockerClientTestCase):
c = create_and_start_container(db)
self.assertEqual(set(get_links(c)), set([]))
@mark.skipif(True, reason="Engine returns error - needs investigating")
def test_start_one_off_container_creates_links_to_its_own_service(self):
db = self.create_service('db')