summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorBruno Oliveira <nicoddemus@gmail.com>2018-03-21 20:39:44 +0000
committerBruno Oliveira <nicoddemus@gmail.com>2018-03-21 20:39:44 +0000
commitf3c87a77a74089d4f285576ee5e7e7d1b8a26717 (patch)
treedc3d41f7fa2969c146c9e8e401201c546d085fec /tox.ini
parent6f95189cf757abc01389f80bf78ba0898dab9438 (diff)
parent672239b1497adc7e36743823cb8c8e9a317da28c (diff)
downloadpytest-f3c87a77a74089d4f285576ee5e7e7d1b8a26717.tar.gz
Merge remote-tracking branch 'upstream/master' into release-3.5.0
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini2
1 files changed, 1 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index c4f3516a6..ac0e04ca0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -205,7 +205,7 @@ rsyncdirs = tox.ini pytest.py _pytest testing
python_files = test_*.py *_test.py testing/*/*.py
python_classes = Test Acceptance
python_functions = test
-norecursedirs = .tox ja .hg cx_freeze_source doc
+norecursedirs = .tox ja .hg cx_freeze_source
xfail_strict=true
filterwarnings =
error