jyapayne/compose
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove version checks from tests requiring API v1.21

Browse source 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
This commit is contained in:
Aanand Prasad 2016-01-12 17:35:48 +00:00
commit b786b47bc8
3 changed files with 13 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

23
tests/integration/project_test.py
View file

@ -6,7 +6,6 @@ import random
import py
from .testcases import DockerClientTestCase
from compose.cli.docker_client import docker_client
from compose.config import config
from compose.config.types import VolumeFromSpec
from compose.config.types import VolumeSpec
@ -105,20 +104,14 @@ class ProjectTest(DockerClientTestCase):
self.assertEqual(db._get_volumes_from(), [data_container.id + ':rw'])
def test_get_network_does_not_exist(self):
self.require_api_version('1.21')
client = docker_client(version='1.21')
project = Project('composetest', [], client)
project = Project('composetest', [], self.client)
assert project.get_network() is None
def test_get_network(self):
self.require_api_version('1.21')
client = docker_client(version='1.21')
network_name = 'network_does_exist'
project = Project(network_name, [], client)
client.create_network(network_name)
self.addCleanup(client.remove_network, network_name)
project = Project(network_name, [], self.client)
self.client.create_network(network_name)
self.addCleanup(self.client.remove_network, network_name)
assert project.get_network()['Name'] == network_name
def test_net_from_service(self):
@ -476,15 +469,13 @@ class ProjectTest(DockerClientTestCase):
self.assertEqual(len(project.get_service('console').containers()), 0)
def test_project_up_with_custom_network(self):
self.require_api_version('1.21')
client = docker_client(version='1.21')
network_name = 'composetest-custom'
client.create_network(network_name)
self.addCleanup(client.remove_network, network_name)
self.client.create_network(network_name)
self.addCleanup(self.client.remove_network, network_name)
web = self.create_service('web', net=Net(network_name))
project = Project('composetest', [web], client, use_networking=True)
project = Project('composetest', [web], self.client, use_networking=True)
project.up()
assert project.get_network() is None

2
tests/integration/service_test.py
View file

@ -718,8 +718,6 @@ class ServiceTest(DockerClientTestCase):
"""Test that calling scale on a service that has a custom container name
results in warning output.
"""
# Disable this test against earlier versions because it is flaky
self.require_api_version('1.21')
service = self.create_service('app', container_name='custom-container')
self.assertEqual(service.custom_container_name(), 'custom-container')