diff options
author | Ben Firshman <ben@firshman.co.uk> | 2016-09-15 12:47:25 +0100 |
---|---|---|
committer | Ben Firshman <ben@firshman.co.uk> | 2016-10-03 11:58:08 +0100 |
commit | 69e992ec48cdb7f7bcb41ed0a66c1dde5fc99f14 (patch) | |
tree | 40585251831786e447d789b74158740049f0a381 | |
parent | 7339d7704346005e270de6765f2d54187372d8c7 (diff) | |
download | docker-py-69e992ec48cdb7f7bcb41ed0a66c1dde5fc99f14.tar.gz |
Move requires_api_version to helpers
Because it's a helper, not a base thing. In preparation for
moving/deleting the unit test base classes.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
-rw-r--r-- | tests/base.py | 12 | ||||
-rw-r--r-- | tests/helpers.py | 11 | ||||
-rw-r--r-- | tests/integration/build_test.py | 2 | ||||
-rw-r--r-- | tests/integration/container_test.py | 2 | ||||
-rw-r--r-- | tests/integration/network_test.py | 2 | ||||
-rw-r--r-- | tests/integration/service_test.py | 2 | ||||
-rw-r--r-- | tests/integration/swarm_test.py | 2 | ||||
-rw-r--r-- | tests/integration/volume_test.py | 3 | ||||
-rw-r--r-- | tests/unit/container_test.py | 2 | ||||
-rw-r--r-- | tests/unit/network_test.py | 14 | ||||
-rw-r--r-- | tests/unit/volume_test.py | 20 |
11 files changed, 35 insertions, 37 deletions
diff --git a/tests/base.py b/tests/base.py index a2c01fc..cac65fd 100644 --- a/tests/base.py +++ b/tests/base.py @@ -1,11 +1,8 @@ import sys import unittest -import pytest import six -import docker - class BaseTestCase(unittest.TestCase): def assertIn(self, object, collection): @@ -14,15 +11,6 @@ class BaseTestCase(unittest.TestCase): return super(BaseTestCase, self).assertIn(object, collection) -def requires_api_version(version): - return pytest.mark.skipif( - docker.utils.version_lt( - docker.constants.DEFAULT_DOCKER_API_VERSION, version - ), - reason="API version is too low (< {0})".format(version) - ) - - class Cleanup(object): if sys.version_info < (2, 7): # Provide a basic implementation of addCleanup for Python < 2.7 diff --git a/tests/helpers.py b/tests/helpers.py index c7b8634..529b727 100644 --- a/tests/helpers.py +++ b/tests/helpers.py @@ -3,6 +3,8 @@ import os.path import tarfile import tempfile +import docker +import pytest def make_tree(dirs, files): @@ -36,3 +38,12 @@ def untar_file(tardata, filename): result = f.read() f.close() return result + + +def requires_api_version(version): + return pytest.mark.skipif( + docker.utils.version_lt( + docker.constants.DEFAULT_DOCKER_API_VERSION, version + ), + reason="API version is too low (< {0})".format(version) + ) diff --git a/tests/integration/build_test.py b/tests/integration/build_test.py index db5ad14..8dcbd57 100644 --- a/tests/integration/build_test.py +++ b/tests/integration/build_test.py @@ -8,7 +8,7 @@ import six from docker import errors -from ..base import requires_api_version +from ..helpers import requires_api_version from .base import BaseIntegrationTest diff --git a/tests/integration/container_test.py b/tests/integration/container_test.py index 88ed0f8..e703f18 100644 --- a/tests/integration/container_test.py +++ b/tests/integration/container_test.py @@ -8,7 +8,7 @@ from docker.utils.socket import read_exactly import pytest import six -from ..base import requires_api_version +from ..helpers import requires_api_version from .. import helpers from .base import BaseIntegrationTest, BUSYBOX diff --git a/tests/integration/network_test.py b/tests/integration/network_test.py index f0f44f0..ea5db06 100644 --- a/tests/integration/network_test.py +++ b/tests/integration/network_test.py @@ -5,7 +5,7 @@ from docker.utils import create_ipam_config from docker.utils import create_ipam_pool import pytest -from ..base import requires_api_version +from ..helpers import requires_api_version from .base import BaseIntegrationTest diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py index 2c80035..960098a 100644 --- a/tests/integration/service_test.py +++ b/tests/integration/service_test.py @@ -2,7 +2,7 @@ import random import docker -from ..base import requires_api_version +from ..helpers import requires_api_version from .base import BaseIntegrationTest diff --git a/tests/integration/swarm_test.py b/tests/integration/swarm_test.py index fe01184..e877ef2 100644 --- a/tests/integration/swarm_test.py +++ b/tests/integration/swarm_test.py @@ -1,7 +1,7 @@ import docker import pytest -from ..base import requires_api_version +from ..helpers import requires_api_version from .base import BaseIntegrationTest diff --git a/tests/integration/volume_test.py b/tests/integration/volume_test.py index 7e3ba8c..329b4e0 100644 --- a/tests/integration/volume_test.py +++ b/tests/integration/volume_test.py @@ -1,8 +1,7 @@ import docker import pytest -from .. import helpers -from ..base import requires_api_version +from ..helpers import requires_api_version from .base import BaseIntegrationTest diff --git a/tests/unit/container_test.py b/tests/unit/container_test.py index 8871b85..779ed69 100644 --- a/tests/unit/container_test.py +++ b/tests/unit/container_test.py @@ -9,7 +9,7 @@ import pytest import six from . import fake_api -from ..base import requires_api_version +from ..helpers import requires_api_version from .api_test import ( DockerClientTest, url_prefix, fake_request, DEFAULT_TIMEOUT_SECONDS, fake_inspect_container diff --git a/tests/unit/network_test.py b/tests/unit/network_test.py index 2521688..93f03da 100644 --- a/tests/unit/network_test.py +++ b/tests/unit/network_test.py @@ -2,7 +2,7 @@ import json import six -from .. import base +from ..helpers import requires_api_version from .api_test import DockerClientTest, url_prefix, response from docker.utils import create_ipam_config, create_ipam_pool @@ -13,7 +13,7 @@ except ImportError: class NetworkTest(DockerClientTest): - @base.requires_api_version('1.21') + @requires_api_version('1.21') def test_list_networks(self): networks = [ { @@ -49,7 +49,7 @@ class NetworkTest(DockerClientTest): filters = json.loads(get.call_args[1]['params']['filters']) self.assertEqual(filters, {'id': ['123']}) - @base.requires_api_version('1.21') + @requires_api_version('1.21') def test_create_network(self): network_data = { "id": 'abc12345', @@ -104,7 +104,7 @@ class NetworkTest(DockerClientTest): } }) - @base.requires_api_version('1.21') + @requires_api_version('1.21') def test_remove_network(self): network_id = 'abc12345' delete = mock.Mock(return_value=response(status_code=200)) @@ -116,7 +116,7 @@ class NetworkTest(DockerClientTest): self.assertEqual(args[0][0], url_prefix + 'networks/{0}'.format(network_id)) - @base.requires_api_version('1.21') + @requires_api_version('1.21') def test_inspect_network(self): network_id = 'abc12345' network_name = 'foo' @@ -138,7 +138,7 @@ class NetworkTest(DockerClientTest): self.assertEqual(args[0][0], url_prefix + 'networks/{0}'.format(network_id)) - @base.requires_api_version('1.21') + @requires_api_version('1.21') def test_connect_container_to_network(self): network_id = 'abc12345' container_id = 'def45678' @@ -167,7 +167,7 @@ class NetworkTest(DockerClientTest): }, }) - @base.requires_api_version('1.21') + @requires_api_version('1.21') def test_disconnect_container_from_network(self): network_id = 'abc12345' container_id = 'def45678' diff --git a/tests/unit/volume_test.py b/tests/unit/volume_test.py index 136d11a..3909977 100644 --- a/tests/unit/volume_test.py +++ b/tests/unit/volume_test.py @@ -2,12 +2,12 @@ import json import pytest -from .. import base +from ..helpers import requires_api_version from .api_test import DockerClientTest, url_prefix, fake_request class VolumeTest(DockerClientTest): - @base.requires_api_version('1.21') + @requires_api_version('1.21') def test_list_volumes(self): volumes = self.client.volumes() self.assertIn('Volumes', volumes) @@ -17,7 +17,7 @@ class VolumeTest(DockerClientTest): self.assertEqual(args[0][0], 'GET') self.assertEqual(args[0][1], url_prefix + 'volumes') - @base.requires_api_version('1.21') + @requires_api_version('1.21') def test_list_volumes_and_filters(self): volumes = self.client.volumes(filters={'dangling': True}) assert 'Volumes' in volumes @@ -29,7 +29,7 @@ class VolumeTest(DockerClientTest): assert args[1] == {'params': {'filters': '{"dangling": ["true"]}'}, 'timeout': 60} - @base.requires_api_version('1.21') + @requires_api_version('1.21') def test_create_volume(self): name = 'perfectcherryblossom' result = self.client.create_volume(name) @@ -43,7 +43,7 @@ class VolumeTest(DockerClientTest): self.assertEqual(args[0][1], url_prefix + 'volumes/create') self.assertEqual(json.loads(args[1]['data']), {'Name': name}) - @base.requires_api_version('1.23') + @requires_api_version('1.23') def test_create_volume_with_labels(self): name = 'perfectcherryblossom' result = self.client.create_volume(name, labels={ @@ -53,13 +53,13 @@ class VolumeTest(DockerClientTest): {'com.example.some-label': 'some-value'} ) - @base.requires_api_version('1.23') + @requires_api_version('1.23') def test_create_volume_with_invalid_labels(self): name = 'perfectcherryblossom' with pytest.raises(TypeError): self.client.create_volume(name, labels=1) - @base.requires_api_version('1.21') + @requires_api_version('1.21') def test_create_volume_with_driver(self): name = 'perfectcherryblossom' driver_name = 'sshfs' @@ -72,7 +72,7 @@ class VolumeTest(DockerClientTest): self.assertIn('Driver', data) self.assertEqual(data['Driver'], driver_name) - @base.requires_api_version('1.21') + @requires_api_version('1.21') def test_create_volume_invalid_opts_type(self): with pytest.raises(TypeError): self.client.create_volume( @@ -89,7 +89,7 @@ class VolumeTest(DockerClientTest): 'perfectcherryblossom', driver_opts='' ) - @base.requires_api_version('1.21') + @requires_api_version('1.21') def test_inspect_volume(self): name = 'perfectcherryblossom' result = self.client.inspect_volume(name) @@ -102,7 +102,7 @@ class VolumeTest(DockerClientTest): self.assertEqual(args[0][0], 'GET') self.assertEqual(args[0][1], '{0}volumes/{1}'.format(url_prefix, name)) - @base.requires_api_version('1.21') + @requires_api_version('1.21') def test_remove_volume(self): name = 'perfectcherryblossom' self.client.remove_volume(name) |