diff options
author | Joffrey F <joffrey@docker.com> | 2018-01-25 14:17:26 -0800 |
---|---|---|
committer | Joffrey F <joffrey@docker.com> | 2018-01-25 17:32:07 -0800 |
commit | 33db9d78ce8903b03175e8ad8c5a0ba9865bf2e4 (patch) | |
tree | 749e2db6d5f247845094c9240887616e7714b16b /tests/unit/api_test.py | |
parent | 9e2148dcc417c1fd613a69ee558c64349b30173d (diff) | |
download | docker-py-bump_api_version_1.35.tar.gz |
Bump default API version to 1.35bump_api_version_1.35
Add ContainerSpec.isolation support
Add until support in logs
Add condition support in wait
Add workdir support in exec_create
Signed-off-by: Joffrey F <joffrey@docker.com>
Diffstat (limited to 'tests/unit/api_test.py')
-rw-r--r-- | tests/unit/api_test.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/tests/unit/api_test.py b/tests/unit/api_test.py index 6ac92c4..ab4cb42 100644 --- a/tests/unit/api_test.py +++ b/tests/unit/api_test.py @@ -104,7 +104,7 @@ class BaseAPIClientTest(unittest.TestCase): _read_from_socket=fake_read_from_socket ) self.patcher.start() - self.client = APIClient() + self.client = APIClient(base_url='https://unittest:8080') # Force-clear authconfig to avoid tampering with the tests self.client._cfg = {'Configs': {}} @@ -126,7 +126,7 @@ class BaseAPIClientTest(unittest.TestCase): class DockerApiTest(BaseAPIClientTest): def test_ctor(self): with pytest.raises(docker.errors.DockerException) as excinfo: - APIClient(version=1.12) + APIClient(base_url='https://unittest:8080', version=1.12) self.assertEqual( str(excinfo.value), @@ -193,7 +193,7 @@ class DockerApiTest(BaseAPIClientTest): ) def test_retrieve_server_version(self): - client = APIClient(version="auto") + client = APIClient(version="auto", base_url='https://unittest:8080') self.assertTrue(isinstance(client._version, six.string_types)) self.assertFalse(client._version == "auto") client.close() @@ -472,7 +472,7 @@ class UserAgentTest(unittest.TestCase): self.patcher.stop() def test_default_user_agent(self): - client = APIClient() + client = APIClient(base_url='https://unittest:8080') client.version() self.assertEqual(self.mock_send.call_count, 1) @@ -481,7 +481,9 @@ class UserAgentTest(unittest.TestCase): self.assertEqual(headers['User-Agent'], expected) def test_custom_user_agent(self): - client = APIClient(user_agent='foo/bar') + client = APIClient( + base_url='https://unittest:8080', user_agent='foo/bar' + ) client.version() self.assertEqual(self.mock_send.call_count, 1) @@ -501,7 +503,7 @@ class DisableSocketTest(unittest.TestCase): return self.timeout def setUp(self): - self.client = APIClient() + self.client = APIClient(base_url='https://unittest:8080') def test_disable_socket_timeout(self): """Test that the timeout is disabled on a generic socket object.""" |