p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged in msabramo/pytest/remove_pdbpp_xfail (pull request #250) 

Remove pdbpp xfails; don't seem necessary anymore
This commit is contained in:
holger krekel 2015-02-19 12:42:23 +01:00
parent 5b73de92c2 777bde7c60
commit ea4e9fa4e2
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
testing/test_doctest.py
View File

@ -3,8 +3,6 @@ import py, pytest
import pdb import pdb
xfail_if_pdbpp_installed = pytest.mark.xfail(hasattr(pdb, "__author__"),
reason="doctest/pdbpp problem: https://bitbucket.org/antocuni/pdb/issue/24/doctests-fail-when-pdbpp-is-installed", run=False)
class TestDoctests: class TestDoctests:
@ -161,7 +159,6 @@ class TestDoctests:
reprec = testdir.inline_run(p, "--doctest-modules") reprec = testdir.inline_run(p, "--doctest-modules")
reprec.assertoutcome(failed=1) reprec.assertoutcome(failed=1)
@xfail_if_pdbpp_installed
def test_doctestmodule_external_and_issue116(self, testdir): def test_doctestmodule_external_and_issue116(self, testdir):
p = testdir.mkpydir("hello") p = testdir.mkpydir("hello")
p.join("__init__.py").write(py.code.Source(""" p.join("__init__.py").write(py.code.Source("""
@ -201,7 +198,6 @@ class TestDoctests:
"*test_txtfile_failing.txt:2: DocTestFailure" "*test_txtfile_failing.txt:2: DocTestFailure"
]) ])
@xfail_if_pdbpp_installed
def test_txtfile_with_fixtures(self, testdir): def test_txtfile_with_fixtures(self, testdir):
p = testdir.maketxtfile(""" p = testdir.maketxtfile("""
>>> dir = getfixture('tmpdir') >>> dir = getfixture('tmpdir')
@ -211,7 +207,6 @@ class TestDoctests:
reprec = testdir.inline_run(p, ) reprec = testdir.inline_run(p, )
reprec.assertoutcome(passed=1) reprec.assertoutcome(passed=1)
@xfail_if_pdbpp_installed
def test_txtfile_with_usefixtures_in_ini(self, testdir): def test_txtfile_with_usefixtures_in_ini(self, testdir):
testdir.makeini(""" testdir.makeini("""
[pytest] [pytest]
@ -232,7 +227,6 @@ class TestDoctests:
reprec = testdir.inline_run(p, ) reprec = testdir.inline_run(p, )
reprec.assertoutcome(passed=1) reprec.assertoutcome(passed=1)
@xfail_if_pdbpp_installed
def test_doctestmodule_with_fixtures(self, testdir): def test_doctestmodule_with_fixtures(self, testdir):
p = testdir.makepyfile(""" p = testdir.makepyfile("""
''' '''
@ -244,7 +238,6 @@ class TestDoctests:
reprec = testdir.inline_run(p, "--doctest-modules") reprec = testdir.inline_run(p, "--doctest-modules")
reprec.assertoutcome(passed=1) reprec.assertoutcome(passed=1)
@xfail_if_pdbpp_installed
def test_doctestmodule_three_tests(self, testdir): def test_doctestmodule_three_tests(self, testdir):
p = testdir.makepyfile(""" p = testdir.makepyfile("""
''' '''
@ -270,7 +263,6 @@ class TestDoctests:
reprec = testdir.inline_run(p, "--doctest-modules") reprec = testdir.inline_run(p, "--doctest-modules")
reprec.assertoutcome(passed=3) reprec.assertoutcome(passed=3)
@xfail_if_pdbpp_installed
def test_doctestmodule_two_tests_one_fail(self, testdir): def test_doctestmodule_two_tests_one_fail(self, testdir):
p = testdir.makepyfile(""" p = testdir.makepyfile("""
class MyClass: class MyClass:

2
testing/test_pdb.py
View File

@ -2,7 +2,6 @@
import py import py
import sys import sys
from test_doctest import xfail_if_pdbpp_installed
class TestPDB: class TestPDB:
def pytest_funcarg__pdblist(self, request): def pytest_funcarg__pdblist(self, request):
@ -187,7 +186,6 @@ class TestPDB:
if child.isalive(): if child.isalive():
child.wait() child.wait()
@xfail_if_pdbpp_installed
def test_pdb_interaction_doctest(self, testdir): def test_pdb_interaction_doctest(self, testdir):
p1 = testdir.makepyfile(""" p1 = testdir.makepyfile("""
import pytest import pytest