diff options
author | holger krekel <holger@merlinux.eu> | 2011-01-11 15:54:47 +0100 |
---|---|---|
committer | holger krekel <holger@merlinux.eu> | 2011-01-11 15:54:47 +0100 |
commit | 170c78cef9c21609976588cb49ce72e7c5183216 (patch) | |
tree | a15203ec0adb797cf1d240a1352fa02c6a0c2c1e /testing/test_conftest.py | |
parent | 8f5d837ef6eee3c4ef6adc11cc99176a2fc94674 (diff) | |
download | pytest-170c78cef9c21609976588cb49ce72e7c5183216.tar.gz |
remove same-conftest.py detection - does more harm than good
(see mail from Ralf Schmitt on py-dev)
Diffstat (limited to 'testing/test_conftest.py')
-rw-r--r-- | testing/test_conftest.py | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/testing/test_conftest.py b/testing/test_conftest.py index e25b68abf..23824be57 100644 --- a/testing/test_conftest.py +++ b/testing/test_conftest.py @@ -170,21 +170,6 @@ def test_setinitial_confcut(testdir): assert conftest.getconftestmodules(sub) == [] assert conftest.getconftestmodules(conf.dirpath()) == [] -def test_conftest_samecontent_detection(testdir): - conf = testdir.makeconftest("x=3") - p = testdir.mkdir("x") - conf.copy(p.join("conftest.py")) - conftest = Conftest() - conftest.setinitial([p]) - l = conftest.getconftestmodules(p) - assert len(l) == 1 - assert l[0].__file__ == p.join("conftest.py") - p2 = p.mkdir("y") - conf.copy(p2.join("conftest.py")) - l = conftest.getconftestmodules(p2) - assert len(l) == 1 - assert l[0].__file__ == p.join("conftest.py") - @pytest.mark.multi(name='test tests whatever .dotdir'.split()) def test_setinitial_conftest_subdirs(testdir, name): sub = testdir.mkdir(name) |