tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1185 from akoskaaa/master 

Make test files and config files pep8 valid
This commit is contained in:
Aanand Prasad 2015-03-26 10:04:37 -07:00
parent baf18decae 4e0f555c58
commit 367ae0c848
15 changed files with 75 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
compose/config.py
View File

@ -39,14 +39,14 @@ ALLOWED_KEYS = DOCKER_CONFIG_KEYS + [
] ]
DOCKER_CONFIG_HINTS = { DOCKER_CONFIG_HINTS = {
'cpu_share' : 'cpu_shares', 'cpu_share': 'cpu_shares',
'link' : 'links', 'link': 'links',
'port' : 'ports', 'port': 'ports',
'privilege' : 'privileged', 'privilege': 'privileged',
'priviliged': 'privileged', 'priviliged': 'privileged',
'privilige' : 'privileged', 'privilige': 'privileged',
'volume' : 'volumes', 'volume': 'volumes',
'workdir' : 'working_dir', 'workdir': 'working_dir',
} }

2
script/test-versions
View File

@ -8,7 +8,7 @@ set -e
script/validate-dco script/validate-dco
>&2 echo "Running lint checks" >&2 echo "Running lint checks"
flake8 compose flake8 compose tests setup.py
if [ "$DOCKER_VERSIONS" == "" ]; then if [ "$DOCKER_VERSIONS" == "" ]; then
DOCKER_VERSIONS="1.5.0" DOCKER_VERSIONS="1.5.0"

3
setup.py
View File

@ -35,6 +35,7 @@ install_requires = [
'six >= 1.3.0, < 2', 'six >= 1.3.0, < 2',
] ]
tests_require = [ tests_require = [
'mock >= 1.0.1', 'mock >= 1.0.1',
'nose', 'nose',
@ -54,7 +55,7 @@ setup(
url='https://www.docker.com/', url='https://www.docker.com/',
author='Docker, Inc.', author='Docker, Inc.',
license='Apache License 2.0', license='Apache License 2.0',
packages=find_packages(exclude=[ 'tests.*', 'tests' ]), packages=find_packages(exclude=['tests.*', 'tests']),
include_package_data=True, include_package_data=True,
test_suite='nose.collector', test_suite='nose.collector',
install_requires=install_requires, install_requires=install_requires,

7
tests/__init__.py
View File

@ -1,7 +1,6 @@
import sys import sys
if sys.version_info >= (2,7): if sys.version_info >= (2, 7):
import unittest import unittest # NOQA
else: else:
import unittest2 as unittest import unittest2 as unittest # NOQA

8
tests/integration/project_test.py
View File

@ -70,7 +70,7 @@ class ProjectTest(DockerClientTestCase):
web = project.get_service('web') web = project.get_service('web')
net = project.get_service('net') net = project.get_service('net')
self.assertEqual(web._get_net(), 'container:'+net.containers()[0].id) self.assertEqual(web._get_net(), 'container:' + net.containers()[0].id)
project.kill() project.kill()
project.remove_stopped() project.remove_stopped()
@ -98,7 +98,7 @@ class ProjectTest(DockerClientTestCase):
project.up() project.up()
web = project.get_service('web') web = project.get_service('web')
self.assertEqual(web._get_net(), 'container:'+net_container.id) self.assertEqual(web._get_net(), 'container:' + net_container.id)
project.kill() project.kill()
project.remove_stopped() project.remove_stopped()
@ -266,7 +266,7 @@ class ProjectTest(DockerClientTestCase):
'image': 'busybox:latest', 'image': 'busybox:latest',
'command': ["/bin/sleep", "300"], 'command': ["/bin/sleep", "300"],
}, },
'data' : { 'data': {
'image': 'busybox:latest', 'image': 'busybox:latest',
'command': ["/bin/sleep", "300"] 'command': ["/bin/sleep", "300"]
}, },
@ -304,7 +304,7 @@ class ProjectTest(DockerClientTestCase):
'image': 'busybox:latest', 'image': 'busybox:latest',
'command': ["/bin/sleep", "300"], 'command': ["/bin/sleep", "300"],
}, },
'data' : { 'data': {
'image': 'busybox:latest', 'image': 'busybox:latest',
'command': ["/bin/sleep", "300"] 'command': ["/bin/sleep", "300"]
}, },

23
tests/integration/service_test.py
View File

@ -182,12 +182,11 @@ class ServiceTest(DockerClientTestCase):
entrypoint=['sleep'], entrypoint=['sleep'],
command=['300'] command=['300']
) )
old_container = service.create_container() service.create_container()
self.assertEqual(len(service.containers(stopped=True)), 1) self.assertEqual(len(service.containers(stopped=True)), 1)
service.recreate_containers() service.recreate_containers()
self.assertEqual(len(service.containers(stopped=True)), 1) self.assertEqual(len(service.containers(stopped=True)), 1)
def test_recreate_containers_with_image_declared_volume(self): def test_recreate_containers_with_image_declared_volume(self):
service = Service( service = Service(
project='composetest', project='composetest',
@ -229,8 +228,7 @@ class ServiceTest(DockerClientTestCase):
set([ set([
'composetest_db_1', 'db_1', 'composetest_db_1', 'db_1',
'composetest_db_2', 'db_2', 'composetest_db_2', 'db_2',
'db', 'db'])
]),
) )
def test_start_container_creates_links_with_names(self): def test_start_container_creates_links_with_names(self):
@ -246,8 +244,7 @@ class ServiceTest(DockerClientTestCase):
set([ set([
'composetest_db_1', 'db_1', 'composetest_db_1', 'db_1',
'composetest_db_2', 'db_2', 'composetest_db_2', 'db_2',
'custom_link_name', 'custom_link_name'])
]),
) )
def test_start_container_with_external_links(self): def test_start_container_with_external_links(self):
@ -265,8 +262,7 @@ class ServiceTest(DockerClientTestCase):
set([ set([
'composetest_db_1', 'composetest_db_1',
'composetest_db_2', 'composetest_db_2',
'db_3', 'db_3']),
]),
) )
def test_start_normal_container_does_not_create_links_to_its_own_service(self): def test_start_normal_container_does_not_create_links_to_its_own_service(self):
@ -291,8 +287,7 @@ class ServiceTest(DockerClientTestCase):
set([ set([
'composetest_db_1', 'db_1', 'composetest_db_1', 'db_1',
'composetest_db_2', 'db_2', 'composetest_db_2', 'db_2',
'db', 'db'])
]),
) )
def test_start_container_builds_images(self): def test_start_container_builds_images(self):
@ -331,7 +326,7 @@ class ServiceTest(DockerClientTestCase):
self.assertEqual(container['HostConfig']['Privileged'], False) self.assertEqual(container['HostConfig']['Privileged'], False)
def test_start_container_becomes_priviliged(self): def test_start_container_becomes_priviliged(self):
service = self.create_service('web', privileged = True) service = self.create_service('web', privileged=True)
container = create_and_start_container(service).inspect() container = create_and_start_container(service).inspect()
self.assertEqual(container['HostConfig']['Privileged'], True) self.assertEqual(container['HostConfig']['Privileged'], True)
@ -483,13 +478,13 @@ class ServiceTest(DockerClientTestCase):
def test_split_env(self): def test_split_env(self):
service = self.create_service('web', environment=['NORMAL=F1', 'CONTAINS_EQUALS=F=2', 'TRAILING_EQUALS=']) service = self.create_service('web', environment=['NORMAL=F1', 'CONTAINS_EQUALS=F=2', 'TRAILING_EQUALS='])
env = create_and_start_container(service).environment env = create_and_start_container(service).environment
for k,v in {'NORMAL': 'F1', 'CONTAINS_EQUALS': 'F=2', 'TRAILING_EQUALS': ''}.items(): for k, v in {'NORMAL': 'F1', 'CONTAINS_EQUALS': 'F=2', 'TRAILING_EQUALS': ''}.items():
self.assertEqual(env[k], v) self.assertEqual(env[k], v)
def test_env_from_file_combined_with_env(self): def test_env_from_file_combined_with_env(self):
service = self.create_service('web', environment=['ONE=1', 'TWO=2', 'THREE=3'], env_file=['tests/fixtures/env/one.env', 'tests/fixtures/env/two.env']) service = self.create_service('web', environment=['ONE=1', 'TWO=2', 'THREE=3'], env_file=['tests/fixtures/env/one.env', 'tests/fixtures/env/two.env'])
env = create_and_start_container(service).environment env = create_and_start_container(service).environment
for k,v in {'ONE': '1', 'TWO': '2', 'THREE': '3', 'FOO': 'baz', 'DOO': 'dah'}.items(): for k, v in {'ONE': '1', 'TWO': '2', 'THREE': '3', 'FOO': 'baz', 'DOO': 'dah'}.items():
self.assertEqual(env[k], v) self.assertEqual(env[k], v)
@mock.patch.dict(os.environ) @mock.patch.dict(os.environ)
@ -499,5 +494,5 @@ class ServiceTest(DockerClientTestCase):
os.environ['ENV_DEF'] = 'E3' os.environ['ENV_DEF'] = 'E3'
service = self.create_service('web', environment={'FILE_DEF': 'F1', 'FILE_DEF_EMPTY': '', 'ENV_DEF': None, 'NO_DEF': None}) service = self.create_service('web', environment={'FILE_DEF': 'F1', 'FILE_DEF_EMPTY': '', 'ENV_DEF': None, 'NO_DEF': None})
env = create_and_start_container(service).environment env = create_and_start_container(service).environment
for k,v in {'FILE_DEF': 'F1', 'FILE_DEF_EMPTY': '', 'ENV_DEF': 'E3', 'NO_DEF': ''}.items(): for k, v in {'FILE_DEF': 'F1', 'FILE_DEF_EMPTY': '', 'ENV_DEF': 'E3', 'NO_DEF': ''}.items():
self.assertEqual(env[k], v) self.assertEqual(env[k], v)

2
tests/unit/cli_test.py
View File

@ -8,7 +8,6 @@ from .. import unittest
import docker import docker
import mock import mock
from six import StringIO
from compose.cli import main from compose.cli import main
from compose.cli.main import TopLevelCommand from compose.cli.main import TopLevelCommand
@ -151,4 +150,3 @@ def make_files(dirname, filenames):
for fname in filenames: for fname in filenames:
with open(os.path.join(dirname, fname), 'w') as f: with open(os.path.join(dirname, fname), 'w') as f:
f.write('') f.write('')

12
tests/unit/config_test.py
View File

@ -4,6 +4,7 @@ from .. import unittest
from compose import config from compose import config
class ConfigTest(unittest.TestCase): class ConfigTest(unittest.TestCase):
def test_from_dictionary(self): def test_from_dictionary(self):
service_dicts = config.from_dictionary({ service_dicts = config.from_dictionary({
@ -82,7 +83,7 @@ class MergeTest(unittest.TestCase):
class EnvTest(unittest.TestCase): class EnvTest(unittest.TestCase):
def test_parse_environment_as_list(self): def test_parse_environment_as_list(self):
environment =[ environment = [
'NORMAL=F1', 'NORMAL=F1',
'CONTAINS_EQUALS=F=2', 'CONTAINS_EQUALS=F=2',
'TRAILING_EQUALS=', 'TRAILING_EQUALS=',
@ -114,8 +115,7 @@ class EnvTest(unittest.TestCase):
os.environ['ENV_DEF'] = 'E3' os.environ['ENV_DEF'] = 'E3'
service_dict = config.make_service_dict( service_dict = config.make_service_dict(
'foo', 'foo', {
{
'environment': { 'environment': {
'FILE_DEF': 'F1', 'FILE_DEF': 'F1',
'FILE_DEF_EMPTY': '', 'FILE_DEF_EMPTY': '',
@ -174,6 +174,7 @@ class EnvTest(unittest.TestCase):
{'FILE_DEF': 'F1', 'FILE_DEF_EMPTY': '', 'ENV_DEF': 'E3', 'NO_DEF': ''}, {'FILE_DEF': 'F1', 'FILE_DEF_EMPTY': '', 'ENV_DEF': 'E3', 'NO_DEF': ''},
) )
class ExtendsTest(unittest.TestCase): class ExtendsTest(unittest.TestCase):
def test_extends(self): def test_extends(self):
service_dicts = config.load('tests/fixtures/extends/docker-compose.yml') service_dicts = config.load('tests/fixtures/extends/docker-compose.yml')
@ -231,10 +232,11 @@ class ExtendsTest(unittest.TestCase):
], ],
) )
def test_extends_validation(self): def test_extends_validation(self):
dictionary = {'extends': None} dictionary = {'extends': None}
load_config = lambda: config.make_service_dict('myweb', dictionary, working_dir='tests/fixtures/extends')
def load_config():
return config.make_service_dict('myweb', dictionary, working_dir='tests/fixtures/extends')
self.assertRaisesRegexp(config.ConfigurationError, 'dictionary', load_config) self.assertRaisesRegexp(config.ConfigurationError, 'dictionary', load_config)

19
tests/unit/container_test.py
View File

@ -9,7 +9,6 @@ from compose.container import Container
class ContainerTest(unittest.TestCase): class ContainerTest(unittest.TestCase):
def setUp(self): def setUp(self):
self.container_dict = { self.container_dict = {
"Id": "abc", "Id": "abc",
@ -30,9 +29,11 @@ class ContainerTest(unittest.TestCase):
container = Container.from_ps(None, container = Container.from_ps(None,
self.container_dict, self.container_dict,
has_been_inspected=True) has_been_inspected=True)
self.assertEqual(container.dictionary, { self.assertEqual(
container.dictionary,
{
"Id": "abc", "Id": "abc",
"Image":"busybox:latest", "Image": "busybox:latest",
"Name": "/composetest_db_1", "Name": "/composetest_db_1",
}) })
@ -44,7 +45,7 @@ class ContainerTest(unittest.TestCase):
has_been_inspected=True) has_been_inspected=True)
self.assertEqual(container.dictionary, { self.assertEqual(container.dictionary, {
"Id": "abc", "Id": "abc",
"Image":"busybox:latest", "Image": "busybox:latest",
"Name": "/composetest_db_1", "Name": "/composetest_db_1",
}) })
@ -100,7 +101,7 @@ class ContainerTest(unittest.TestCase):
def test_human_readable_ports_public_and_private(self): def test_human_readable_ports_public_and_private(self):
self.container_dict['NetworkSettings']['Ports'].update({ self.container_dict['NetworkSettings']['Ports'].update({
"45454/tcp": [ { "HostIp": "0.0.0.0", "HostPort": "49197" } ], "45454/tcp": [{"HostIp": "0.0.0.0", "HostPort": "49197"}],
"45453/tcp": [], "45453/tcp": [],
}) })
container = Container(None, self.container_dict, has_been_inspected=True) container = Container(None, self.container_dict, has_been_inspected=True)
@ -110,7 +111,7 @@ class ContainerTest(unittest.TestCase):
def test_get_local_port(self): def test_get_local_port(self):
self.container_dict['NetworkSettings']['Ports'].update({ self.container_dict['NetworkSettings']['Ports'].update({
"45454/tcp": [ { "HostIp": "0.0.0.0", "HostPort": "49197" } ], "45454/tcp": [{"HostIp": "0.0.0.0", "HostPort": "49197"}],
}) })
container = Container(None, self.container_dict, has_been_inspected=True) container = Container(None, self.container_dict, has_been_inspected=True)
@ -120,12 +121,12 @@ class ContainerTest(unittest.TestCase):
def test_get(self): def test_get(self):
container = Container(None, { container = Container(None, {
"Status":"Up 8 seconds", "Status": "Up 8 seconds",
"HostConfig": { "HostConfig": {
"VolumesFrom": ["volume_id",] "VolumesFrom": ["volume_id"]
}, },
}, has_been_inspected=True) }, has_been_inspected=True)
self.assertEqual(container.get('Status'), "Up 8 seconds") self.assertEqual(container.get('Status'), "Up 8 seconds")
self.assertEqual(container.get('HostConfig.VolumesFrom'), ["volume_id",]) self.assertEqual(container.get('HostConfig.VolumesFrom'), ["volume_id"])
self.assertEqual(container.get('Foo.Bar.DoesNotExist'), None) self.assertEqual(container.get('Foo.Bar.DoesNotExist'), None)

1
tests/unit/progress_stream_test.py
View File

@ -2,7 +2,6 @@ from __future__ import unicode_literals
from __future__ import absolute_import from __future__ import absolute_import
from tests import unittest from tests import unittest
import mock
from six import StringIO from six import StringIO
from compose import progress_stream from compose import progress_stream

5
tests/unit/project_test.py
View File

@ -8,6 +8,7 @@ from compose import config
import mock import mock
import docker import docker
class ProjectTest(unittest.TestCase): class ProjectTest(unittest.TestCase):
def test_from_dict(self): def test_from_dict(self):
project = Project.from_dicts('composetest', [ project = Project.from_dicts('composetest', [
@ -211,7 +212,7 @@ class ProjectTest(unittest.TestCase):
} }
], mock_client) ], mock_client)
service = project.get_service('test') service = project.get_service('test')
self.assertEqual(service._get_net(), 'container:'+container_id) self.assertEqual(service._get_net(), 'container:' + container_id)
def test_use_net_from_service(self): def test_use_net_from_service(self):
container_name = 'test_aaa_1' container_name = 'test_aaa_1'
@ -237,4 +238,4 @@ class ProjectTest(unittest.TestCase):
], mock_client) ], mock_client)
service = project.get_service('test') service = project.get_service('test')
self.assertEqual(service._get_net(), 'container:'+container_name) self.assertEqual(service._get_net(), 'container:' + container_name)

22
tests/unit/service_test.py
View File

@ -146,16 +146,16 @@ class ServiceTest(unittest.TestCase):
def test_build_port_bindings_with_one_port(self): def test_build_port_bindings_with_one_port(self):
port_bindings = build_port_bindings(["127.0.0.1:1000:1000"]) port_bindings = build_port_bindings(["127.0.0.1:1000:1000"])
self.assertEqual(port_bindings["1000"],[("127.0.0.1","1000")]) self.assertEqual(port_bindings["1000"], [("127.0.0.1", "1000")])
def test_build_port_bindings_with_matching_internal_ports(self): def test_build_port_bindings_with_matching_internal_ports(self):
port_bindings = build_port_bindings(["127.0.0.1:1000:1000","127.0.0.1:2000:1000"]) port_bindings = build_port_bindings(["127.0.0.1:1000:1000", "127.0.0.1:2000:1000"])
self.assertEqual(port_bindings["1000"],[("127.0.0.1","1000"),("127.0.0.1","2000")]) self.assertEqual(port_bindings["1000"], [("127.0.0.1", "1000"), ("127.0.0.1", "2000")])
def test_build_port_bindings_with_nonmatching_internal_ports(self): def test_build_port_bindings_with_nonmatching_internal_ports(self):
port_bindings = build_port_bindings(["127.0.0.1:1000:1000","127.0.0.1:2000:2000"]) port_bindings = build_port_bindings(["127.0.0.1:1000:1000", "127.0.0.1:2000:2000"])
self.assertEqual(port_bindings["1000"],[("127.0.0.1","1000")]) self.assertEqual(port_bindings["1000"], [("127.0.0.1", "1000")])
self.assertEqual(port_bindings["2000"],[("127.0.0.1","2000")]) self.assertEqual(port_bindings["2000"], [("127.0.0.1", "2000")])
def test_split_domainname_none(self): def test_split_domainname_none(self):
service = Service('foo', hostname='name', client=self.mock_client) service = Service('foo', hostname='name', client=self.mock_client)
@ -165,7 +165,8 @@ class ServiceTest(unittest.TestCase):
self.assertFalse('domainname' in opts, 'domainname') self.assertFalse('domainname' in opts, 'domainname')
def test_split_domainname_fqdn(self): def test_split_domainname_fqdn(self):
service = Service('foo', service = Service(
'foo',
hostname='name.domain.tld', hostname='name.domain.tld',
client=self.mock_client) client=self.mock_client)
self.mock_client.containers.return_value = [] self.mock_client.containers.return_value = []
@ -174,7 +175,8 @@ class ServiceTest(unittest.TestCase):
self.assertEqual(opts['domainname'], 'domain.tld', 'domainname') self.assertEqual(opts['domainname'], 'domain.tld', 'domainname')
def test_split_domainname_both(self): def test_split_domainname_both(self):
service = Service('foo', service = Service(
'foo',
hostname='name', hostname='name',
domainname='domain.tld', domainname='domain.tld',
client=self.mock_client) client=self.mock_client)
@ -184,7 +186,8 @@ class ServiceTest(unittest.TestCase):
self.assertEqual(opts['domainname'], 'domain.tld', 'domainname') self.assertEqual(opts['domainname'], 'domain.tld', 'domainname')
def test_split_domainname_weird(self): def test_split_domainname_weird(self):
service = Service('foo', service = Service(
'foo',
hostname='name.sub', hostname='name.sub',
domainname='domain.tld', domainname='domain.tld',
client=self.mock_client) client=self.mock_client)
@ -315,4 +318,3 @@ class ServiceVolumesTest(unittest.TestCase):
self.assertEqual( self.assertEqual(
binding, binding,
('/home/user', dict(bind='/home/user', ro=False))) ('/home/user', dict(bind='/home/user', ro=False)))

1
tests/unit/split_buffer_test.py
View File

@ -3,6 +3,7 @@ from __future__ import absolute_import
from compose.cli.utils import split_buffer from compose.cli.utils import split_buffer
from .. import unittest from .. import unittest
class SplitBufferTest(unittest.TestCase): class SplitBufferTest(unittest.TestCase):
def test_single_line_chunks(self): def test_single_line_chunks(self):
def reader(): def reader():

2
tox.ini
View File

@ -8,7 +8,7 @@ deps =
-rrequirements-dev.txt -rrequirements-dev.txt
commands = commands =
nosetests -v {posargs} nosetests -v {posargs}
flake8 compose flake8 compose tests setup.py
[flake8] [flake8]
# ignore line-length for now # ignore line-length for now