From f70cb8974e85e33fa9acc2965947f867be8b6d3a Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Mon, 15 May 2017 16:05:54 +0200 Subject: [PATCH] Consider testpaths config when looking for manage.py --- pytest_django/plugin.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pytest_django/plugin.py b/pytest_django/plugin.py index a71505bdc..401fd612f 100644 --- a/pytest_django/plugin.py +++ b/pytest_django/plugin.py @@ -114,7 +114,7 @@ def _handle_import_error(extra_message): raise ImportError(msg) -def _add_django_project_to_path(args): +def _add_django_project_to_path(early_config, args): def is_django_project(path): return path.is_dir() and (path / 'manage.py').exists() @@ -123,7 +123,8 @@ def find_django_path(args): args = [p for p in args if p.is_dir()] if not args: - args = [pathlib.Path.cwd()] + args = [pathlib.Path(x) for x in early_config.getini('testpaths') + ] + [pathlib.Path.cwd()] for arg in args: if is_django_project(arg): @@ -199,7 +200,7 @@ def pytest_load_initial_conftests(early_config, parser, args): early_config.getini('django_find_project'), 'django_find_project') if django_find_project: - _django_project_scan_outcome = _add_django_project_to_path(args) + _django_project_scan_outcome = _add_django_project_to_path(early_config, args) else: _django_project_scan_outcome = PROJECT_SCAN_DISABLED