From f0bfe9de3d957867c56a4b7b514226d992049c2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jurko=20Gospodneti=C4=87?= Date: Fri, 1 Dec 2017 13:28:39 +0100 Subject: [PATCH] shorten some test code --- testing/acceptance_test.py | 4 ++-- testing/test_conftest.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py index a7838545b..21d17453b 100644 --- a/testing/acceptance_test.py +++ b/testing/acceptance_test.py @@ -215,8 +215,8 @@ class TestGeneralUsage(object): assert not result.ret def test_issue109_sibling_conftests_not_loaded(self, testdir): - sub1 = testdir.tmpdir.mkdir("sub1") - sub2 = testdir.tmpdir.mkdir("sub2") + sub1 = testdir.mkdir("sub1") + sub2 = testdir.mkdir("sub2") sub1.join("conftest.py").write("assert 0") result = testdir.runpytest(sub2) assert result.ret == EXIT_NOTESTSCOLLECTED diff --git a/testing/test_conftest.py b/testing/test_conftest.py index c0411b723..dd54e0c5b 100644 --- a/testing/test_conftest.py +++ b/testing/test_conftest.py @@ -84,7 +84,7 @@ def test_conftest_in_nonpkg_with_init(tmpdir): def test_doubledash_considered(testdir): conf = testdir.mkdir("--option") - conf.join("conftest.py").ensure() + conf.ensure("conftest.py") conftest = PytestPluginManager() conftest_setinitial(conftest, [conf.basename, conf.basename]) values = conftest._getconftestmodules(conf)