diff --git a/tests/integration_test.py b/tests/integration_test.py index 815cd37d..243f3117 100644 --- a/tests/integration_test.py +++ b/tests/integration_test.py @@ -245,30 +245,25 @@ class TestCreateContainerWithRoBinds(BaseTestCase): self.assertFalse(inspect_data['VolumesRW'][mount_dest]) -@unittest.skipIf(NOT_ON_HOST, 'Tests running inside a container; no syslog') -class TestCreateContainerWithLogConfig(BaseTestCase): - def runTest(self): - config = docker.utils.LogConfig( - type=docker.utils.LogConfig.types.SYSLOG, - config={'key1': 'val1'} +class CreateContainerWithLogConfigTest(BaseTestCase): + def test_valid_log_driver_and_log_opt(self): + log_config = docker.utils.LogConfig( + type='json-file', + config={'max-file': '100'} ) - ctnr = self.client.create_container( + + container = self.client.create_container( 'busybox', ['true'], host_config=self.client.create_host_config(log_config=config) ) - self.assertIn('Id', ctnr) - self.tmp_containers.append(ctnr['Id']) - self.client.start(ctnr) - info = self.client.inspect_container(ctnr) - self.assertIn('HostConfig', info) - host_config = info['HostConfig'] - self.assertIn('LogConfig', host_config) - log_config = host_config['LogConfig'] - self.assertIn('Type', log_config) - self.assertEqual(log_config['Type'], config.type) - self.assertIn('Config', log_config) - self.assertEqual(type(log_config['Config']), dict) - self.assertEqual(log_config['Config'], config.config) + self.tmp_containers.append(container['Id']) + self.client.start(container) + + info = self.client.inspect_container(container) + container_log_config = info['HostConfig']['LogConfig'] + + self.assertEqual(container_log_config['Type'], log_config.type) + self.assertEqual(container_log_config['Config'], log_config.config) @unittest.skipIf(not EXEC_DRIVER_IS_NATIVE, 'Exec driver not native')