summaryrefslogtreecommitdiff
path: root/testing/example_scripts
diff options
context:
space:
mode:
authorBruno Oliveira <nicoddemus@gmail.com>2018-08-06 10:09:31 -0300
committerGitHub <noreply@github.com>2018-08-06 10:09:31 -0300
commite7230691652ff31fcc1cd92e4f5bf080f386b681 (patch)
tree34dfde3cfddde4e22970c1dc08c04d0f4eca7d47 /testing/example_scripts
parent855fd17014e904124e4cb644d730cbaabfc07e1f (diff)
parentfe0a76e1a61fab631ba21ca29a4cd13c71a3f807 (diff)
downloadpytest-e7230691652ff31fcc1cd92e4f5bf080f386b681.tar.gz
Merge pull request #3771 from nicoddemus/package-infinite-recursion-bug
Fix infinite recursion collection bug with pytest_ignore_collect hook
Diffstat (limited to 'testing/example_scripts')
-rw-r--r--testing/example_scripts/collect/package_infinite_recursion/conftest.py2
-rw-r--r--testing/example_scripts/collect/package_infinite_recursion/tests/__init__.py0
-rw-r--r--testing/example_scripts/collect/package_infinite_recursion/tests/test_basic.py2
3 files changed, 4 insertions, 0 deletions
diff --git a/testing/example_scripts/collect/package_infinite_recursion/conftest.py b/testing/example_scripts/collect/package_infinite_recursion/conftest.py
new file mode 100644
index 000000000..9629fa646
--- /dev/null
+++ b/testing/example_scripts/collect/package_infinite_recursion/conftest.py
@@ -0,0 +1,2 @@
+def pytest_ignore_collect(path):
+ return False
diff --git a/testing/example_scripts/collect/package_infinite_recursion/tests/__init__.py b/testing/example_scripts/collect/package_infinite_recursion/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/testing/example_scripts/collect/package_infinite_recursion/tests/__init__.py
diff --git a/testing/example_scripts/collect/package_infinite_recursion/tests/test_basic.py b/testing/example_scripts/collect/package_infinite_recursion/tests/test_basic.py
new file mode 100644
index 000000000..f17482385
--- /dev/null
+++ b/testing/example_scripts/collect/package_infinite_recursion/tests/test_basic.py
@@ -0,0 +1,2 @@
+def test():
+ pass