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

Merge pull request #1099 from aanand/fix-env-file-resolution

Browse source 
Fix env file resolution
This commit is contained in:
Ben Firshman 2015-03-13 16:49:10 +00:00
commit dae451019b
15 changed files with 403 additions and 285 deletions
Download patch file Download diff file Expand all files Collapse all files

16
tests/integration/cli_test.py
View file

@ -1,5 +1,6 @@
from __future__ import absolute_import
import sys
import os
from six import StringIO
from mock import patch
@ -23,6 +24,12 @@ class CLITestCase(DockerClientTestCase):
@property
def project(self):
# Hack: allow project to be overridden. This needs refactoring so that
# the project object is built exactly once, by the command object, and
# accessed by the test case object.
if hasattr(self, '_project'):
return self._project
return self.command.get_project(self.command.get_config_path())
def test_help(self):
@ -409,3 +416,12 @@ class CLITestCase(DockerClientTestCase):
self.assertEqual(get_port(3000), container.get_local_port(3000))
self.assertEqual(get_port(3001), "0.0.0.0:9999")
self.assertEqual(get_port(3002), "")
def test_env_file_relative_to_compose_file(self):
config_path = os.path.abspath('tests/fixtures/env-file/docker-compose.yml')
self.command.dispatch(['-f', config_path, 'up', '-d'], None)
self._project = self.command.get_project(config_path)
containers = self.project.containers(stopped=True)
self.assertEqual(len(containers), 1)
self.assertIn("FOO=1", containers[0].get('Config.Env'))

41
tests/integration/project_test.py
View file

@ -1,14 +1,15 @@
from __future__ import unicode_literals
from compose.project import Project, ConfigurationError
from compose import config
from compose.project import Project
from compose.container import Container
from .testcases import DockerClientTestCase
class ProjectTest(DockerClientTestCase):
def test_volumes_from_service(self):
project = Project.from_config(
project = Project.from_dicts(
name='composetest',
config={
service_dicts=config.from_dictionary({
'data': {
'image': 'busybox:latest',
'volumes': ['/var/data'],
@ -17,7 +18,7 @@ class ProjectTest(DockerClientTestCase):
'image': 'busybox:latest',
'volumes_from': ['data'],
},
},
}),
client=self.client,
)
db = project.get_service('db')
@ -31,14 +32,14 @@ class ProjectTest(DockerClientTestCase):
volumes=['/var/data'],
name='composetest_data_container',
)
project = Project.from_config(
project = Project.from_dicts(
name='composetest',
config={
service_dicts=config.from_dictionary({
'db': {
'image': 'busybox:latest',
'volumes_from': ['composetest_data_container'],
},
},
}),
client=self.client,
)
db = project.get_service('db')
@ -48,9 +49,9 @@ class ProjectTest(DockerClientTestCase):
project.remove_stopped()
def test_net_from_service(self):
project = Project.from_config(
project = Project.from_dicts(
name='composetest',
config={
service_dicts=config.from_dictionary({
'net': {
'image': 'busybox:latest',
'command': ["/bin/sleep", "300"]
@ -59,8 +60,8 @@ class ProjectTest(DockerClientTestCase):
'image': 'busybox:latest',
'net': 'container:net',
'command': ["/bin/sleep", "300"]
},
},
},
}),
client=self.client,
)
@ -82,14 +83,14 @@ class ProjectTest(DockerClientTestCase):
)
net_container.start()
project = Project.from_config(
project = Project.from_dicts(
name='composetest',
config={
service_dicts=config.from_dictionary({
'web': {
'image': 'busybox:latest',
'net': 'container:composetest_net_container'
},
},
}),
client=self.client,
)
@ -257,9 +258,9 @@ class ProjectTest(DockerClientTestCase):
project.remove_stopped()
def test_project_up_starts_depends(self):
project = Project.from_config(
project = Project.from_dicts(
name='composetest',
config={
service_dicts=config.from_dictionary({
'console': {
'image': 'busybox:latest',
'command': ["/bin/sleep", "300"],
@ -278,7 +279,7 @@ class ProjectTest(DockerClientTestCase):
'command': ["/bin/sleep", "300"],
'links': ['db'],
},
},
}),
client=self.client,
)
project.start()
@ -295,9 +296,9 @@ class ProjectTest(DockerClientTestCase):
project.remove_stopped()
def test_project_up_with_no_deps(self):
project = Project.from_config(
project = Project.from_dicts(
name='composetest',
config={
service_dicts=config.from_dictionary({
'console': {
'image': 'busybox:latest',
'command': ["/bin/sleep", "300"],
@ -316,7 +317,7 @@ class ProjectTest(DockerClientTestCase):
'command': ["/bin/sleep", "300"],
'links': ['db'],
},
},
}),
client=self.client,
)
project.start()

15
tests/integration/service_test.py
View file

@ -2,6 +2,7 @@ from __future__ import unicode_literals
from __future__ import absolute_import
import os
from os import path
import mock
from compose import Service
from compose.service import CannotBeScaledError
@ -481,16 +482,12 @@ class ServiceTest(DockerClientTestCase):
for k,v in {'ONE': '1', 'TWO': '2', 'THREE': '3', 'FOO': 'baz', 'DOO': 'dah'}.items():
self.assertEqual(env[k], v)
@mock.patch.dict(os.environ)
def test_resolve_env(self):
service = self.create_service('web', environment={'FILE_DEF': 'F1', 'FILE_DEF_EMPTY': '', 'ENV_DEF': None, 'NO_DEF': None})
os.environ['FILE_DEF'] = 'E1'
os.environ['FILE_DEF_EMPTY'] = 'E2'
os.environ['ENV_DEF'] = 'E3'
try:
env = create_and_start_container(service).environment
for k,v in {'FILE_DEF': 'F1', 'FILE_DEF_EMPTY': '', 'ENV_DEF': 'E3', 'NO_DEF': ''}.items():
self.assertEqual(env[k], v)
finally:
del os.environ['FILE_DEF']
del os.environ['FILE_DEF_EMPTY']
del os.environ['ENV_DEF']
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
for k,v in {'FILE_DEF': 'F1', 'FILE_DEF_EMPTY': '', 'ENV_DEF': 'E3', 'NO_DEF': ''}.items():
self.assertEqual(env[k], v)

8
tests/integration/testcases.py
View file

@ -1,6 +1,7 @@
from __future__ import unicode_literals
from __future__ import absolute_import
from compose.service import Service
from compose.config import make_service_dict
from compose.cli.docker_client import docker_client
from compose.progress_stream import stream_output
from .. import unittest
@ -21,14 +22,15 @@ class DockerClientTestCase(unittest.TestCase):
self.client.remove_image(i)
def create_service(self, name, **kwargs):
kwargs['image'] = "busybox:latest"
if 'command' not in kwargs:
kwargs['command'] = ["/bin/sleep", "300"]
return Service(
project='composetest',
name=name,
client=self.client,
image="busybox:latest",
**kwargs
**make_service_dict(name, kwargs, working_dir='.')
)
def check_build(self, *args, **kwargs):