From a1d550a14c188dd9ce30d6344e35c5e48ad8f75d Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Wed, 25 Jan 2017 16:31:43 -0800 Subject: Allow configuring API version for integration test with env var Signed-off-by: Joffrey F --- tests/integration/models_services_test.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'tests/integration/models_services_test.py') diff --git a/tests/integration/models_services_test.py b/tests/integration/models_services_test.py index 27979dd..9b5676d 100644 --- a/tests/integration/models_services_test.py +++ b/tests/integration/models_services_test.py @@ -4,21 +4,22 @@ import docker import pytest from .. import helpers +from .base import TEST_API_VERSION class ServiceTest(unittest.TestCase): @classmethod def setUpClass(cls): - client = docker.from_env() + client = docker.from_env(version=TEST_API_VERSION) helpers.force_leave_swarm(client) client.swarm.init('eth0', listen_addr=helpers.swarm_listen_addr()) @classmethod def tearDownClass(cls): - helpers.force_leave_swarm(docker.from_env()) + helpers.force_leave_swarm(docker.from_env(version=TEST_API_VERSION)) def test_create(self): - client = docker.from_env() + client = docker.from_env(version=TEST_API_VERSION) name = helpers.random_name() service = client.services.create( # create arguments @@ -36,7 +37,7 @@ class ServiceTest(unittest.TestCase): assert container_spec['Labels'] == {'container': 'label'} def test_get(self): - client = docker.from_env() + client = docker.from_env(version=TEST_API_VERSION) name = helpers.random_name() service = client.services.create( name=name, @@ -47,7 +48,7 @@ class ServiceTest(unittest.TestCase): assert service.name == name def test_list_remove(self): - client = docker.from_env() + client = docker.from_env(version=TEST_API_VERSION) service = client.services.create( name=helpers.random_name(), image="alpine", @@ -58,7 +59,7 @@ class ServiceTest(unittest.TestCase): assert service not in client.services.list() def test_tasks(self): - client = docker.from_env() + client = docker.from_env(version=TEST_API_VERSION) service1 = client.services.create( name=helpers.random_name(), image="alpine", @@ -83,7 +84,7 @@ class ServiceTest(unittest.TestCase): @pytest.mark.skip(reason="Makes Swarm unstable?") def test_update(self): - client = docker.from_env() + client = docker.from_env(version=TEST_API_VERSION) service = client.services.create( # create arguments name=helpers.random_name(), -- cgit v1.2.1