From 98e9c022dcb78de60db59a670d65b39cf9a40993 Mon Sep 17 00:00:00 2001
From: Nicolas Dietrich <nicodietrich@gmail.com>
Date: Wed, 30 Jul 2014 22:35:54 +0200
Subject: [PATCH] Only enable capture (=mute) pytest in py.test_run_all

If capture is enabled, ipdb doesn't work in tests.

Therefore we only capture output in the py.test_run_all script.
---
 buildout.cfg   | 2 +-
 etc/pytest.ini | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildout.cfg b/buildout.cfg
index 52ec74a42..258c4baa1 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -99,7 +99,7 @@ recipe = collective.recipe.template
 input = inline:
     #!/bin/bash
     cd ${buildout:directory}
-    bin/py.test --timeout=60 src/adhocracy src/adhocracy_sample tests "$@"
+    bin/py.test --capture=fd --timeout=60 src/adhocracy src/adhocracy_sample tests "$@"
 output = ${buildout:bin-directory}/py.test_run_all
 mode = 755
 
diff --git a/etc/pytest.ini b/etc/pytest.ini
index 2dbfe58ce..42cfdef65 100644
--- a/etc/pytest.ini
+++ b/etc/pytest.ini
@@ -2,7 +2,7 @@
 addopts =
     --doctest-glob='*.rst'
     --tb=native
-    --capture=fd
+    --capture=no
     --splinter-implicit-wait=1
     --splinter-speed=0
     --splinter-socket-timeout=120