summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Van Berkom <tristan.van.berkom@gmail.com>2018-08-20 11:47:53 +0000
committerTristan Van Berkom <tristan.van.berkom@gmail.com>2018-08-20 11:47:53 +0000
commit372abed5f1b2202435d553b28fa807a913f8b5b9 (patch)
tree0239baf28e959e57dd676c1684f142d82e2bdf1e
parent30f696f27a4a5281af86d9e41ecc2e4c2ef32ebf (diff)
parentc15cb95155d9a17bfb1a4f453fae917d2d8d2dee (diff)
downloadbuildstream-372abed5f1b2202435d553b28fa807a913f8b5b9.tar.gz
Merge branch 'tristan/exclude-project-py-from-tests' into 'master'
setup.cfg: Add tests/integration/project to norecursedirs See merge request BuildStream/buildstream!682
-rw-r--r--setup.cfg2
1 files changed, 1 insertions, 1 deletions
diff --git a/setup.cfg b/setup.cfg
index d37db7839..a59d2b214 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -11,7 +11,7 @@ test=pytest
[tool:pytest]
addopts = --verbose --basetemp ./tmp --pep8 --pylint --pylint-rcfile=.pylintrc --cov=buildstream --cov-config .coveragerc
-norecursedirs = integration-cache tmp __pycache__ .eggs
+norecursedirs = tests/integration/project integration-cache tmp __pycache__ .eggs
python_files = tests/*/*.py
pep8maxlinelength = 119
pep8ignore =