From d3933cd34a88e811b9612d728569fc9be6d560d4 Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Tue, 4 Dec 2018 17:13:40 -0800 Subject: [PATCH] Move multi-push test to unit tests Signed-off-by: Joffrey F --- tests/integration/project_test.py | 18 ------------------ tests/unit/project_test.py | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py index 203b7bb3d..57f3b7074 100644 --- a/tests/integration/project_test.py +++ b/tests/integration/project_test.py @@ -1995,21 +1995,3 @@ class ProjectTest(DockerClientTestCase): net_data = self.client.inspect_network(full_net_name) assert net_data assert net_data['Labels'][LABEL_PROJECT] == '-dashtest' - - def test_avoid_multiple_push(self): - service_config_latest = {'image': 'busybox:latest', 'build': '.'} - service_config_default = {'image': 'busybox', 'build': '.'} - service_config_sha = { - 'image': 'busybox@sha256:38a203e1986cf79639cfb9b2e1d6e773de84002feea2d4eb006b52004ee8502d', - 'build': '.' - } - svc1 = self.create_service('busy1', **service_config_latest) - svc1_1 = self.create_service('busy11', **service_config_latest) - svc2 = self.create_service('busy2', **service_config_default) - svc2_1 = self.create_service('busy21', **service_config_default) - svc3 = self.create_service('busy3', **service_config_sha) - svc3_1 = self.create_service('busy31', **service_config_sha) - project = Project('composetest', [svc1, svc1_1, svc2, svc2_1, svc3, svc3_1], self.client) - with mock.patch('compose.service.Service.push') as fake_push: - project.push(ignore_push_failures=True) - assert fake_push.call_count == 2 diff --git a/tests/unit/project_test.py b/tests/unit/project_test.py index 1cc841814..f17bc571e 100644 --- a/tests/unit/project_test.py +++ b/tests/unit/project_test.py @@ -620,3 +620,23 @@ class ProjectTest(unittest.TestCase): self.mock_client.pull.side_effect = OperationFailedError(b'pull error') with pytest.raises(ProjectError): project.pull(parallel_pull=True) + + def test_avoid_multiple_push(self): + service_config_latest = {'image': 'busybox:latest', 'build': '.'} + service_config_default = {'image': 'busybox', 'build': '.'} + service_config_sha = { + 'image': 'busybox@sha256:38a203e1986cf79639cfb9b2e1d6e773de84002feea2d4eb006b52004ee8502d', + 'build': '.' + } + svc1 = Service('busy1', **service_config_latest) + svc1_1 = Service('busy11', **service_config_latest) + svc2 = Service('busy2', **service_config_default) + svc2_1 = Service('busy21', **service_config_default) + svc3 = Service('busy3', **service_config_sha) + svc3_1 = Service('busy31', **service_config_sha) + project = Project( + 'composetest', [svc1, svc1_1, svc2, svc2_1, svc3, svc3_1], self.mock_client + ) + with mock.patch('compose.service.Service.push') as fake_push: + project.push() + assert fake_push.call_count == 2