Merge pull request #2420 from thaJeztah/fix_master_builds

shin- · web-flow · commit 8acd2c3d0848 · 2019-08-29T15:21:57.000-07:00
Fix broken test due to BUSYBOX -&gt; TEST_IMG rename
diff --git a/tests/integration/api_service_test.py b/tests/integration/api_service_test.py
@@ -376,7 +376,7 @@ def test_create_service_with_network_attachment_config(self):
             'dockerpytest_1', driver='overlay', ipam={'Driver': 'default'}
         )
         self.tmp_networks.append(network['Id'])
-        container_spec = docker.types.ContainerSpec(BUSYBOX, ['true'])
+        container_spec = docker.types.ContainerSpec(TEST_IMG, ['true'])
         network_config = docker.types.NetworkAttachmentConfig(
             target='dockerpytest_1',
             aliases=['dockerpytest_1_alias'],

Original file line number	Diff line number	Diff line change
`@@ -376,7 +376,7 @@ def test_create_service_with_network_attachment_config(self):`
`376`	`376`	`'dockerpytest_1', driver='overlay', ipam={'Driver': 'default'}`
`377`	`377`	`)`
`378`	`378`	`self.tmp_networks.append(network['Id'])`
`379`		`- container_spec = docker.types.ContainerSpec(BUSYBOX, ['true'])`
	`379`	`+ container_spec = docker.types.ContainerSpec(TEST_IMG, ['true'])`
`380`	`380`	`network_config = docker.types.NetworkAttachmentConfig(`
`381`	`381`	`target='dockerpytest_1',`
`382`	`382`	`aliases=['dockerpytest_1_alias'],`