diff options
| author | holger krekel <holger@merlinux.eu> | 2014-04-02 22:30:45 +0200 |
|---|---|---|
| committer | holger krekel <holger@merlinux.eu> | 2014-04-02 22:30:45 +0200 |
| commit | 0365e5c3a0cf62cdf9328131ea05f7557f969d9e (patch) | |
| tree | c8a70bc170d4e0f29597979095f78b459d006ea0 /_pytest/main.py | |
| parent | e6859406f129c2579cf99147f1464e7fdeb4dfa5 (diff) | |
| download | pytest-0365e5c3a0cf62cdf9328131ea05f7557f969d9e.tar.gz | |
cleanup internal conftest handling and avoid the strange None entry in the conftest cache.
(There is basically no reason to ask for conftestmodules without specifying a path.)
--HG--
branch : conftest-clean
Diffstat (limited to '_pytest/main.py')
| -rw-r--r-- | _pytest/main.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/_pytest/main.py b/_pytest/main.py index b4cea1ca0..4ba8253d7 100644 --- a/_pytest/main.py +++ b/_pytest/main.py @@ -144,7 +144,7 @@ def pytest_ignore_collect(path, config): p = path.dirpath() ignore_paths = config._getconftest_pathlist("collect_ignore", path=p) ignore_paths = ignore_paths or [] - excludeopt = config.getvalue("ignore") + excludeopt = config.getoption("ignore") if excludeopt: ignore_paths.extend([py.path.local(x) for x in excludeopt]) return path in ignore_paths |