summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJoffrey F <f.joffrey@gmail.com>2015-11-12 11:23:16 -0800
committerJoffrey F <f.joffrey@gmail.com>2015-11-12 11:23:16 -0800
commitc3197dcce7ef48c4ea0911c5f0832bf7d822965e (patch)
tree559f804c21b092b8d8d82fbc202520772048fd5e /tests
parent6e73f04acc16f847c64a7d14cd9cdfd810b8a515 (diff)
parentb0bb4ff3a4488cff579c6432acef0f57b3bf6ca8 (diff)
downloaddocker-py-c3197dcce7ef48c4ea0911c5f0832bf7d822965e.tar.gz
Merge pull request #850 from docker/mnowster-test-no-log-driver-specified
Rebased #798
Diffstat (limited to 'tests')
-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 3340e4b..7db7240 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="",