diff options
| author | Ben Firshman <ben@firshman.co.uk> | 2016-09-06 10:48:47 +0200 |
|---|---|---|
| committer | Ben Firshman <ben@firshman.co.uk> | 2016-11-22 17:03:04 +0000 |
| commit | e055a1c813768984c776a4d83b33ca2dbcd5f316 (patch) | |
| tree | 6bc0b7d9f2a6310a9da41878c1c915f4f3d7f60e | |
| parent | dac7174ff2408bf9e28b4c330e24e38c130d372c (diff) | |
| download | docker-py-e055a1c813768984c776a4d83b33ca2dbcd5f316.tar.gz | |
Rename DockerClientTest to BaseAPIClientTest
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
| -rw-r--r-- | tests/unit/api_build_test.py | 4 | ||||
| -rw-r--r-- | tests/unit/api_container_test.py | 8 | ||||
| -rw-r--r-- | tests/unit/api_exec_test.py | 4 | ||||
| -rw-r--r-- | tests/unit/api_image_test.py | 4 | ||||
| -rw-r--r-- | tests/unit/api_network_test.py | 4 | ||||
| -rw-r--r-- | tests/unit/api_test.py | 4 | ||||
| -rw-r--r-- | tests/unit/api_volume_test.py | 4 | ||||
| -rw-r--r-- | tests/unit/swarm_test.py | 4 |
8 files changed, 18 insertions, 18 deletions
diff --git a/tests/unit/api_build_test.py b/tests/unit/api_build_test.py index b2705eb..8146fee 100644 --- a/tests/unit/api_build_test.py +++ b/tests/unit/api_build_test.py @@ -4,10 +4,10 @@ import io import docker from docker import auth -from .api_test import DockerClientTest, fake_request, url_prefix +from .api_test import BaseAPIClientTest, fake_request, url_prefix -class BuildTest(DockerClientTest): +class BuildTest(BaseAPIClientTest): def test_build_container(self): script = io.BytesIO('\n'.join([ 'FROM busybox', diff --git a/tests/unit/api_container_test.py b/tests/unit/api_container_test.py index 5eb6c53..6c08064 100644 --- a/tests/unit/api_container_test.py +++ b/tests/unit/api_container_test.py @@ -11,7 +11,7 @@ import six from . import fake_api from ..helpers import requires_api_version from .api_test import ( - DockerClientTest, url_prefix, fake_request, DEFAULT_TIMEOUT_SECONDS, + BaseAPIClientTest, url_prefix, fake_request, DEFAULT_TIMEOUT_SECONDS, fake_inspect_container ) @@ -25,7 +25,7 @@ def fake_inspect_container_tty(self, container): return fake_inspect_container(self, container, tty=True) -class StartContainerTest(DockerClientTest): +class StartContainerTest(BaseAPIClientTest): def test_start_container(self): self.client.start(fake_api.FAKE_CONTAINER_ID) @@ -168,7 +168,7 @@ class StartContainerTest(DockerClientTest): ) -class CreateContainerTest(DockerClientTest): +class CreateContainerTest(BaseAPIClientTest): def test_create_container(self): self.client.create_container('busybox', 'true') @@ -1180,7 +1180,7 @@ class CreateContainerTest(DockerClientTest): self.assertEqual(json.loads(args[1]['data'])['Env'], expected) -class ContainerTest(DockerClientTest): +class ContainerTest(BaseAPIClientTest): def test_list_containers(self): self.client.containers(all=True) diff --git a/tests/unit/api_exec_test.py b/tests/unit/api_exec_test.py index 6ba2a3d..41ee940 100644 --- a/tests/unit/api_exec_test.py +++ b/tests/unit/api_exec_test.py @@ -2,11 +2,11 @@ import json from . import fake_api from .api_test import ( - DockerClientTest, url_prefix, fake_request, DEFAULT_TIMEOUT_SECONDS, + BaseAPIClientTest, url_prefix, fake_request, DEFAULT_TIMEOUT_SECONDS, ) -class ExecTest(DockerClientTest): +class ExecTest(BaseAPIClientTest): def test_exec_create(self): self.client.exec_create(fake_api.FAKE_CONTAINER_ID, ['ls', '-1']) diff --git a/tests/unit/api_image_test.py b/tests/unit/api_image_test.py index be9d574..fbfb146 100644 --- a/tests/unit/api_image_test.py +++ b/tests/unit/api_image_test.py @@ -4,7 +4,7 @@ import pytest from . import fake_api from docker import auth from .api_test import ( - DockerClientTest, fake_request, DEFAULT_TIMEOUT_SECONDS, url_prefix, + BaseAPIClientTest, fake_request, DEFAULT_TIMEOUT_SECONDS, url_prefix, fake_resolve_authconfig ) @@ -14,7 +14,7 @@ except ImportError: import mock -class ImageTest(DockerClientTest): +class ImageTest(BaseAPIClientTest): def test_image_viz(self): with pytest.raises(Exception): self.client.images('busybox', viz=True) diff --git a/tests/unit/api_network_test.py b/tests/unit/api_network_test.py index 083b2e6..8e09c67 100644 --- a/tests/unit/api_network_test.py +++ b/tests/unit/api_network_test.py @@ -2,7 +2,7 @@ import json import six -from .api_test import DockerClientTest, url_prefix, response +from .api_test import BaseAPIClientTest, url_prefix, response from ..helpers import requires_api_version from docker.utils import create_ipam_config, create_ipam_pool @@ -12,7 +12,7 @@ except ImportError: import mock -class NetworkTest(DockerClientTest): +class NetworkTest(BaseAPIClientTest): @requires_api_version('1.21') def test_list_networks(self): networks = [ diff --git a/tests/unit/api_test.py b/tests/unit/api_test.py index 3ab500a..f57865a 100644 --- a/tests/unit/api_test.py +++ b/tests/unit/api_test.py @@ -93,7 +93,7 @@ url_prefix = '{0}v{1}/'.format( docker.constants.DEFAULT_DOCKER_API_VERSION) -class DockerClientTest(unittest.TestCase): +class BaseAPIClientTest(unittest.TestCase): def setUp(self): self.patcher = mock.patch.multiple( 'docker.api.client.APIClient', @@ -123,7 +123,7 @@ class DockerClientTest(unittest.TestCase): } -class DockerApiTest(DockerClientTest): +class DockerApiTest(BaseAPIClientTest): def test_ctor(self): with pytest.raises(docker.errors.DockerException) as excinfo: APIClient(version=1.12) diff --git a/tests/unit/api_volume_test.py b/tests/unit/api_volume_test.py index 3909977..cb72cb2 100644 --- a/tests/unit/api_volume_test.py +++ b/tests/unit/api_volume_test.py @@ -3,10 +3,10 @@ import json import pytest from ..helpers import requires_api_version -from .api_test import DockerClientTest, url_prefix, fake_request +from .api_test import BaseAPIClientTest, url_prefix, fake_request -class VolumeTest(DockerClientTest): +class VolumeTest(BaseAPIClientTest): @requires_api_version('1.21') def test_list_volumes(self): volumes = self.client.volumes() diff --git a/tests/unit/swarm_test.py b/tests/unit/swarm_test.py index 39d4ec4..374f8b2 100644 --- a/tests/unit/swarm_test.py +++ b/tests/unit/swarm_test.py @@ -4,10 +4,10 @@ import json from . import fake_api from ..helpers import requires_api_version -from .api_test import (DockerClientTest, url_prefix, fake_request) +from .api_test import BaseAPIClientTest, url_prefix, fake_request -class SwarmTest(DockerClientTest): +class SwarmTest(BaseAPIClientTest): @requires_api_version('1.24') def test_node_update(self): node_spec = { |
