From 66a690928cc847c48774906e5ea60f578ddb216c Mon Sep 17 00:00:00 2001 From: Ronny Pfannschmidt Date: Wed, 19 Sep 2018 18:17:10 +0200 Subject: [PATCH] bring in purepath and fix an assertion --- src/pytest.py | 3 +++ testing/test_tmpdir.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pytest.py b/src/pytest.py index e173fd3d4..9ed7536d1 100644 --- a/src/pytest.py +++ b/src/pytest.py @@ -26,6 +26,7 @@ from _pytest.warning_types import ( RemovedInPytest4Warning, PytestExperimentalApiWarning, ) +from _pytest.compat import Path, PurePath set_trace = __pytestPDB.set_trace @@ -67,6 +68,8 @@ __all__ = [ "warns", "xfail", "yield_fixture", + "Path", + "PurePath", ] if __name__ == "__main__": diff --git a/testing/test_tmpdir.py b/testing/test_tmpdir.py index 2acfec5c0..0ea47aef4 100644 --- a/testing/test_tmpdir.py +++ b/testing/test_tmpdir.py @@ -111,7 +111,7 @@ def test_tmpdir_factory(testdir): def session_dir(tmpdir_factory): return tmpdir_factory.mktemp('data', numbered=False) def test_some(session_dir): - session_dir.isdir() + assert session_dir.isdir() """ ) reprec = testdir.inline_run()