floraachy/pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved py.code code over to py.test

Browse Source 
Fix #103
This commit is contained in:
Bruno Oliveira
2015-11-27 12:43:01 -02:00
parent ed3c96ee58
commit a912d3745b
45 changed files with 4559 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
testing/python/collect.py
View File

@@ -1,6 +1,9 @@
import sys
from textwrap import dedent
import pytest, py
import _pytest._code
import py
import pytest
from _pytest.main import EXIT_NOTESTSCOLLECTED
@@ -598,13 +601,13 @@ class TestConftestCustomization:
def test_customized_pymakemodule_issue205_subdir(self, testdir):
b = testdir.mkdir("a").mkdir("b")
b.join("conftest.py").write(py.code.Source("""
b.join("conftest.py").write(_pytest._code.Source("""
def pytest_pycollect_makemodule(__multicall__):
mod = __multicall__.execute()
mod.obj.hello = "world"
return mod
"""))
b.join("test_module.py").write(py.code.Source("""
b.join("test_module.py").write(_pytest._code.Source("""
def test_hello():
assert hello == "world"
"""))
@@ -613,7 +616,7 @@ class TestConftestCustomization:
def test_customized_pymakeitem(self, testdir):
b = testdir.mkdir("a").mkdir("b")
b.join("conftest.py").write(py.code.Source("""
b.join("conftest.py").write(_pytest._code.Source("""
import pytest
@pytest.hookimpl(hookwrapper=True)
def pytest_pycollect_makeitem():
@@ -624,7 +627,7 @@ class TestConftestCustomization:
for func in result:
func._some123 = "world"
"""))
b.join("test_module.py").write(py.code.Source("""
b.join("test_module.py").write(_pytest._code.Source("""
import pytest
@pytest.fixture()
@@ -662,7 +665,7 @@ class TestConftestCustomization:
def test_setup_only_available_in_subdir(testdir):
sub1 = testdir.mkpydir("sub1")
sub2 = testdir.mkpydir("sub2")
sub1.join("conftest.py").write(py.code.Source("""
sub1.join("conftest.py").write(_pytest._code.Source("""
import pytest
def pytest_runtest_setup(item):
assert item.fspath.purebasename == "test_in_sub1"
@@ -671,7 +674,7 @@ def test_setup_only_available_in_subdir(testdir):
def pytest_runtest_teardown(item):
assert item.fspath.purebasename == "test_in_sub1"
"""))
sub2.join("conftest.py").write(py.code.Source("""
sub2.join("conftest.py").write(_pytest._code.Source("""
import pytest
def pytest_runtest_setup(item):
assert item.fspath.purebasename == "test_in_sub2"
@@ -787,7 +790,7 @@ class TestTracebackCutting:
except ValueError:
_, _, tb = sys.exc_info()
tb = py.code.Traceback(tb)
tb = _pytest._code.Traceback(tb)
assert isinstance(tb[-1].path, str)
assert not filter_traceback(tb[-1])
@@ -810,7 +813,7 @@ class TestTracebackCutting:
_, _, tb = sys.exc_info()
testdir.tmpdir.join('filter_traceback_entry_as_str.py').remove()
tb = py.code.Traceback(tb)
tb = _pytest._code.Traceback(tb)
assert isinstance(tb[-1].path, str)
assert filter_traceback(tb[-1])