Merge pull request #797 from paulbellamy/test-race-condition

mnowster · mnowster · commit 1c97c691bff2 · 2015-10-01T15:39:47.000+01:00
Fix race condition in integration regression tests
diff --git a/tests/integration_test.py b/tests/integration_test.py
@@ -1762,7 +1762,7 @@ def test_792_explicit_port_protocol(self):
 
         tcp_port, udp_port = random.sample(range(9999, 32000), 2)
         ctnr = self.client.create_container(
-            BUSYBOX, 'true', ports=[2000, (2000, 'udp')],
+            BUSYBOX, ['sleep', '9999'], ports=[2000, (2000, 'udp')],
             host_config=self.client.create_host_config(
                 port_bindings={'2000/tcp': tcp_port, '2000/udp': udp_port}
             )

Original file line number	Diff line number	Diff line change
`@@ -1762,7 +1762,7 @@ def test_792_explicit_port_protocol(self):`
`1762`	`1762`
`1763`	`1763`	`tcp_port, udp_port = random.sample(range(9999, 32000), 2)`
`1764`	`1764`	`ctnr = self.client.create_container(`
`1765`		`- BUSYBOX, 'true', ports=[2000, (2000, 'udp')],`
	`1765`	`+ BUSYBOX, ['sleep', '9999'], ports=[2000, (2000, 'udp')],`
`1766`	`1766`	`host_config=self.client.create_host_config(`
`1767`	`1767`	`port_bindings={'2000/tcp': tcp_port, '2000/udp': udp_port}`
`1768`	`1768`	`)`