mirror of https://github.com/docker/compose.git
[pep8] flake8 run for everything, fix items from this change
Signed-off-by: akoskaaa <akos.hochrein@prezi.com>
This commit is contained in:
parent
f9ea5ecf40
commit
fa2fb6bd38
|
@ -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
|
||||||
|
|
||||||
if [ "$DOCKER_VERSIONS" == "" ]; then
|
if [ "$DOCKER_VERSIONS" == "" ]; then
|
||||||
DOCKER_VERSIONS="1.5.0"
|
DOCKER_VERSIONS="1.5.0"
|
||||||
|
|
|
@ -1,6 +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
|
||||||
|
|
|
@ -182,7 +182,7 @@ 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)
|
||||||
|
@ -262,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):
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -234,7 +234,9 @@ 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)
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue