tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move multi-push test to unit tests 

Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2018-12-04 17:13:40 -08:00
parent 5b2092688a
commit d3933cd34a
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/integration/project_test.py
View File

@ -1995,21 +1995,3 @@ class ProjectTest(DockerClientTestCase):
net_data = self.client.inspect_network(full_net_name) net_data = self.client.inspect_network(full_net_name)
assert net_data assert net_data
assert net_data['Labels'][LABEL_PROJECT] == '-dashtest' 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

20
tests/unit/project_test.py
View File

@ -620,3 +620,23 @@ class ProjectTest(unittest.TestCase):
self.mock_client.pull.side_effect = OperationFailedError(b'pull error') self.mock_client.pull.side_effect = OperationFailedError(b'pull error')
with pytest.raises(ProjectError): with pytest.raises(ProjectError):
project.pull(parallel_pull=True) 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