tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-14 17:24:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use true_name for remove operation

Browse Source 
Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2018-04-24 16:10:59 -07:00
parent d9a6d30f6d
commit 7341dba569
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compose/network.py
View File

@ -95,14 +95,11 @@ class Network(object):
def remove(self): def remove(self):
if self.external: if self.external:
log.info("Network %s is external, skipping", self.full_name) log.info("Network %s is external, skipping", self.true_name)
return return
log.info("Removing network {}".format(self.true_name)) log.info("Removing network {}".format(self.true_name))
try: self.client.remove_network(self.true_name)
self.client.remove_network(self.full_name)
except NotFound:
self.client.remove_network(self.legacy_full_name)
def inspect(self, legacy=False): def inspect(self, legacy=False):
if legacy: if legacy:

9
compose/volume.py
View File

@ -38,13 +38,10 @@ class Volume(object):
def remove(self): def remove(self):
if self.external: if self.external:
log.info("Volume %s is external, skipping", self.full_name) log.info("Volume %s is external, skipping", self.true_name)
return return
log.info("Removing volume %s", self.full_name) log.info("Removing volume %s", self.true_name)
try: return self.client.remove_volume(self.true_name)
return self.client.remove_volume(self.full_name)
except NotFound:
self.client.remove_volume(self.legacy_full_name)
def inspect(self, legacy=None): def inspect(self, legacy=None):
if legacy: if legacy:

3
tests/unit/network_test.py
View File

@ -84,6 +84,7 @@ class NetworkTest(unittest.TestCase):
{'Driver': 'overlay', 'Options': remote_options}, net {'Driver': 'overlay', 'Options': remote_options}, net
) )
@mock.patch('compose.network.Network.true_name', lambda n: n.full_name)
def test_check_remote_network_config_driver_mismatch(self): def test_check_remote_network_config_driver_mismatch(self):
net = Network(None, 'compose_test', 'net1', 'overlay') net = Network(None, 'compose_test', 'net1', 'overlay')
with pytest.raises(NetworkConfigChangedError) as e: with pytest.raises(NetworkConfigChangedError) as e:
@ -93,6 +94,7 @@ class NetworkTest(unittest.TestCase):
assert 'driver has changed' in str(e.value) assert 'driver has changed' in str(e.value)
@mock.patch('compose.network.Network.true_name', lambda n: n.full_name)
def test_check_remote_network_config_options_mismatch(self): def test_check_remote_network_config_options_mismatch(self):
net = Network(None, 'compose_test', 'net1', 'overlay') net = Network(None, 'compose_test', 'net1', 'overlay')
with pytest.raises(NetworkConfigChangedError) as e: with pytest.raises(NetworkConfigChangedError) as e:
@ -146,6 +148,7 @@ class NetworkTest(unittest.TestCase):
net net
) )
@mock.patch('compose.network.Network.true_name', lambda n: n.full_name)
def test_check_remote_network_labels_mismatch(self): def test_check_remote_network_labels_mismatch(self):
net = Network(None, 'compose_test', 'net1', 'overlay', labels={ net = Network(None, 'compose_test', 'net1', 'overlay', labels={
'com.project.touhou.character': 'sakuya.izayoi' 'com.project.touhou.character': 'sakuya.izayoi'

2
tests/unit/project_test.py
View File

@ -60,6 +60,7 @@ class ProjectTest(unittest.TestCase):
assert project.get_service('db').options['image'] == 'busybox:latest' assert project.get_service('db').options['image'] == 'busybox:latest'
assert not project.networks.use_networking assert not project.networks.use_networking
@mock.patch('compose.network.Network.true_name', lambda n: n.full_name)
def test_from_config_v2(self): def test_from_config_v2(self):
config = Config( config = Config(
version=V2_0, version=V2_0,
@ -217,6 +218,7 @@ class ProjectTest(unittest.TestCase):
) )
assert project.get_service('test')._get_volumes_from() == [container_name + ":rw"] assert project.get_service('test')._get_volumes_from() == [container_name + ":rw"]
@mock.patch('compose.network.Network.true_name', lambda n: n.full_name)
def test_use_volumes_from_service_container(self): def test_use_volumes_from_service_container(self):
container_ids = ['aabbccddee', '12345'] container_ids = ['aabbccddee', '12345']