diff options
| author | Bruno Oliveira <nicoddemus@gmail.com> | 2016-07-20 19:33:36 -0300 |
|---|---|---|
| committer | Bruno Oliveira <nicoddemus@gmail.com> | 2016-07-20 19:33:36 -0300 |
| commit | e0f08a73abd3edbae910ede82d6b4525401b5f95 (patch) | |
| tree | 1a00cae01bd304ac0b24a86b390713864c71627c /testing/test_conftest.py | |
| parent | 0171cfa30f188dd1e9a2475c47dd654042e4669e (diff) | |
| parent | 93aae987a229465862769c6460e7cf97eee6fcb0 (diff) | |
| download | pytest-e0f08a73abd3edbae910ede82d6b4525401b5f95.tar.gz | |
Merge branch 'features' into conftest-exception-printing
Diffstat (limited to 'testing/test_conftest.py')
| -rw-r--r-- | testing/test_conftest.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/testing/test_conftest.py b/testing/test_conftest.py index 54a7d4009..377283eb9 100644 --- a/testing/test_conftest.py +++ b/testing/test_conftest.py @@ -203,6 +203,7 @@ def test_conftest_import_order(testdir, monkeypatch): def impct(p): return p conftest = PytestPluginManager() + conftest._confcutdir = testdir.tmpdir monkeypatch.setattr(conftest, '_importconftest', impct) assert conftest._getconftestmodules(sub) == [ct1, ct2] |