summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoffrey F <f.joffrey@gmail.com>2016-01-25 10:32:13 -0800
committerJoffrey F <f.joffrey@gmail.com>2016-01-25 10:32:13 -0800
commit9b3b0967098206efba487f9dbcfb24ac53f5bde6 (patch)
tree80d7a36a16e4b2b6961621daec765b2b40dd9c88
parenta909e2e5ee62eec7ba681177ab292a58a99fd9ec (diff)
parent464b9bcdc3c2e709dd475a1d14d5efb83b3c7bce (diff)
downloaddocker-py-9b3b0967098206efba487f9dbcfb24ac53f5bde6.tar.gz
Merge pull request #906 from aanand/capture-stdout-stderr
Re-enable stdout/stderr capturing in tests
-rw-r--r--pytest.ini2
1 files changed, 1 insertions, 1 deletions
diff --git a/pytest.ini b/pytest.ini
index f9c7990..21b47a6 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,2 +1,2 @@
[pytest]
-addopts = --tb=short -rxs -s
+addopts = --tb=short -rxs