summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2015-11-12 11:09:39 -0800
committerJoffrey F <joffrey@docker.com>2015-11-12 11:11:51 -0800
commitb0bb4ff3a4488cff579c6432acef0f57b3bf6ca8 (patch)
treeeb47401a150ee72f9417d242f2bdc0a94b55dbdb
parentfe858f5ecc8b6db4b38b39813900b6558ab3108c (diff)
parent7ed8eb5da9805d1155ded88fc65d2f62e2d29613 (diff)
downloaddocker-py-mnowster-test-no-log-driver-specified.tar.gz
Merge branch 'test-no-log-driver-specified' of https://github.com/mnowster/docker-py into mnowster-test-no-log-driver-specifiedmnowster-test-no-log-driver-specified
Signed-off-by: Joffrey F <joffrey@docker.com>
-rw-r--r--tests/integration/container_test.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/integration/container_test.py b/tests/integration/container_test.py
index 9606e14..58a4391 100644
--- a/tests/integration/container_test.py
+++ b/tests/integration/container_test.py
@@ -297,8 +297,6 @@ class CreateContainerTest(api_test.BaseTestCase):
assert expected_msg in str(excinfo.value)
- @pytest.mark.skipif(True,
- reason="https://github.com/docker/docker/issues/15633")
def test_valid_no_log_driver_specified(self):
log_config = docker.utils.LogConfig(
type="",