From 4839baf877c87cb652acfa72f35a61550c789494 Mon Sep 17 00:00:00 2001 From: Zal Daroga Date: Tue, 12 Dec 2017 16:17:29 -0600 Subject: [PATCH] Fixed python34 comparison issue Signed-off-by: Zal Daroga --- compose/service.py | 2 +- tests/acceptance/cli_test.py | 3 ++- tests/fixtures/networks/ordered-networks.yml | 8 +++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/compose/service.py b/compose/service.py index 131e8b858..0b20f00b9 100644 --- a/compose/service.py +++ b/compose/service.py @@ -560,7 +560,7 @@ class Service(object): def prioritized_networks(self): prioritized_networks = OrderedDict( - sorted(self.networks.items(), key=lambda t: t[1].get('priority', 0), reverse=True)) + sorted(self.networks.items(), key=lambda t: t[1].get('priority', 0) or 0, reverse=True)) return prioritized_networks def connect_container_to_networks(self, container): diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py index 47913e212..26d336b65 100644 --- a/tests/acceptance/cli_test.py +++ b/tests/acceptance/cli_test.py @@ -1278,7 +1278,8 @@ class CLITestCase(DockerClientTestCase): self.base_dir = 'tests/fixtures/networks' result = self.dispatch(['-f', 'ordered-networks.yml', 'up', '-d']) - assert 'Connecting to networks_bar\nConnecting to networks_foo' in result.stdout + assert 'Connecting to networks_buzz\nConnecting to networks_foo' \ + '\nConnecting to networks_bar' in result.stdout @v3_only() def test_up_with_healthcheck(self): diff --git a/tests/fixtures/networks/ordered-networks.yml b/tests/fixtures/networks/ordered-networks.yml index af2432869..afb02930f 100644 --- a/tests/fixtures/networks/ordered-networks.yml +++ b/tests/fixtures/networks/ordered-networks.yml @@ -4,10 +4,12 @@ services: web: image: busybox command: top - networks: ["foo", "bar"] + networks: ["foo", "bar", "buzz"] networks: foo: - priority: 1 + priority: 2 bar: - priority: 2 + priority: 1 + buzz: + priority: 3