diff options
author | Joffrey F <joffrey@docker.com> | 2015-10-08 12:07:08 -0700 |
---|---|---|
committer | Joffrey F <joffrey@docker.com> | 2015-10-08 12:09:59 -0700 |
commit | eb869c0bd33879c03287c8b9b762e1f6113e7d7f (patch) | |
tree | 7939462e0440b77c35beaf342e197aed1df8bc49 | |
parent | 77df9c485d1b7f1efbb91f655d3cf19a18a6e3da (diff) | |
download | docker-py-eb869c0bd33879c03287c8b9b762e1f6113e7d7f.tar.gz |
Fix tests
Skips were masking some errors / compatibility issues
Signed-off-by: Joffrey F <joffrey@docker.com>
-rw-r--r-- | tests/integration_test.py | 5 | ||||
-rw-r--r-- | tests/test.py | 17 |
2 files changed, 13 insertions, 9 deletions
diff --git a/tests/integration_test.py b/tests/integration_test.py index f4e2089..da380c1 100644 --- a/tests/integration_test.py +++ b/tests/integration_test.py @@ -21,7 +21,6 @@ import random import shutil import signal import socket -import sys import tarfile import tempfile import threading @@ -1606,7 +1605,7 @@ class TestBuildWithDockerignore(Cleanup, BaseTestCase): @requires_api_version('1.21') class TestNetworks(BaseTestCase): def create_network(self, *args, **kwargs): - net_name = 'dockerpy{}'.format(random.randrange(sys.maxint))[:14] + net_name = 'dockerpy{}'.format(random.getrandbits(24))[:14] net_id = self.client.create_network(net_name, *args, **kwargs)['id'] self.tmp_networks.append(net_id) return (net_name, net_id) @@ -1639,7 +1638,7 @@ class TestNetworks(BaseTestCase): }) def test_create_network_with_host_driver_fails(self): - net_name = 'dockerpy{}'.format(random.randrange(sys.maxint))[:14] + net_name = 'dockerpy{}'.format(random.getrandbits(24))[:14] with pytest.raises(APIError): self.client.create_network(net_name, driver='host') diff --git a/tests/test.py b/tests/test.py index 42c925f..dbb755f 100644 --- a/tests/test.py +++ b/tests/test.py @@ -369,6 +369,7 @@ class DockerClientTest(Cleanup, base.BaseTestCase): timeout=DEFAULT_TIMEOUT_SECONDS ) + @base.requires_api_version('1.21') def test_list_networks(self): networks = [ { @@ -2208,9 +2209,7 @@ class DockerClientTest(Cleanup, base.BaseTestCase): self.assertEqual(args[0][0], 'POST') self.assertEqual(args[0][1], url_prefix + 'volumes') - self.assertEqual(args[1]['data'], { - 'Name': name, 'Driver': None, 'DriverOpts': None - }) + self.assertEqual(json.loads(args[1]['data']), {'Name': name}) @base.requires_api_version('1.21') def test_create_volume_with_driver(self): @@ -2221,8 +2220,9 @@ class DockerClientTest(Cleanup, base.BaseTestCase): self.assertEqual(args[0][0], 'POST') self.assertEqual(args[0][1], url_prefix + 'volumes') - self.assertIn('Driver', args[1]['data']) - self.assertEqual(args[1]['data']['Driver'], driver_name) + data = json.loads(args[1]['data']) + self.assertIn('Driver', data) + self.assertEqual(data['Driver'], driver_name) @base.requires_api_version('1.21') def test_create_volume_invalid_opts_type(self): @@ -2258,7 +2258,7 @@ class DockerClientTest(Cleanup, base.BaseTestCase): def test_remove_volume(self): name = 'perfectcherryblossom' result = self.client.remove_volume(name) - self.assertIsNone(result) + self.assertTrue(result) args = fake_request.call_args self.assertEqual(args[0][0], 'DELETE') @@ -2268,6 +2268,7 @@ class DockerClientTest(Cleanup, base.BaseTestCase): # NETWORK TESTS # ##################### + @base.requires_api_version('1.21') def test_create_network(self): network_data = { "id": 'abc12345', @@ -2295,6 +2296,7 @@ class DockerClientTest(Cleanup, base.BaseTestCase): json.loads(post.call_args[1]['data']), {"name": "foo", "driver": "bridge"}) + @base.requires_api_version('1.21') def test_remove_network(self): network_id = 'abc12345' delete = mock.Mock(return_value=response(status_code=200)) @@ -2306,6 +2308,7 @@ class DockerClientTest(Cleanup, base.BaseTestCase): self.assertEqual(args[0][0], url_prefix + 'networks/{0}'.format(network_id)) + @base.requires_api_version('1.21') def test_inspect_network(self): network_id = 'abc12345' network_name = 'foo' @@ -2327,6 +2330,7 @@ class DockerClientTest(Cleanup, base.BaseTestCase): self.assertEqual(args[0][0], url_prefix + 'networks/{0}'.format(network_id)) + @base.requires_api_version('1.21') def test_connect_container_to_network(self): network_id = 'abc12345' container_id = 'def45678' @@ -2345,6 +2349,7 @@ class DockerClientTest(Cleanup, base.BaseTestCase): json.loads(post.call_args[1]['data']), {'container': container_id}) + @base.requires_api_version('1.21') def test_disconnect_container_from_network(self): network_id = 'abc12345' container_id = 'def45678' |