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

Changed logging override test into integration test

Browse source 
Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2016-01-11 16:25:19 -08:00
commit ca634649bb
3 changed files with 53 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

23
tests/acceptance/cli_test.py
View file

@ -744,29 +744,6 @@ class CLITestCase(DockerClientTestCase):
self.assertEqual(log_config.get('Type'), 'json-file')
self.assertEqual(log_config.get('Config')['max-size'], '10m')
def test_up_logging_with_multiple_files(self):
self.base_dir = 'tests/fixtures/logging-composefile'
config_paths = [
'docker-compose.yml',
'compose2.yml',
]
self._project = get_project(self.base_dir, config_paths)
self.dispatch(
[
'-f', config_paths[0],
'-f', config_paths[1],
'up', '-d',
],
None)
containers = self.project.containers()
self.assertEqual(len(containers), 2)
another = self.project.get_service('another').containers()[0]
log_config = another.get('HostConfig.LogConfig')
self.assertTrue(log_config)
self.assertEqual(log_config.get('Type'), 'none')
def test_pause_unpause(self):
self.dispatch(['up', '-d'], None)
service = self.project.get_service('simple')