[Pytest-commit] commit/pytest: hpk42: Merged in msabramo/pytest/remove_pdbpp_xfail (pull request #250)

[commits-noreply at bitbucket.org]

1 new commit in pytest:

https://bitbucket.org/hpk42/pytest/commits/0ba56c3c5ef4/
Changeset:   0ba56c3c5ef4
User:        hpk42
Date:        2015-02-19 11:42:23+00:00
Summary:     Merged in msabramo/pytest/remove_pdbpp_xfail (pull request #250)

Remove pdbpp xfails; don't seem necessary anymore
Affected #:  2 files

diff -r 5fc366c50b56a94638c959be8456d2cb3c7e7c1c -r 0ba56c3c5ef40dabe0693d2d743cdf2b887873ec testing/test_doctest.py
--- a/testing/test_doctest.py
+++ b/testing/test_doctest.py
@@ -3,8 +3,6 @@
 
 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:
 
@@ -161,7 +159,6 @@
         reprec = testdir.inline_run(p, "--doctest-modules")
         reprec.assertoutcome(failed=1)
 
-    @xfail_if_pdbpp_installed
     def test_doctestmodule_external_and_issue116(self, testdir):
         p = testdir.mkpydir("hello")
         p.join("__init__.py").write(py.code.Source("""
@@ -201,7 +198,6 @@
             "*test_txtfile_failing.txt:2: DocTestFailure"
         ])
 
-    @xfail_if_pdbpp_installed
     def test_txtfile_with_fixtures(self, testdir):
         p = testdir.maketxtfile("""
             >>> dir = getfixture('tmpdir')
@@ -211,7 +207,6 @@
         reprec = testdir.inline_run(p, )
         reprec.assertoutcome(passed=1)
 
-    @xfail_if_pdbpp_installed
     def test_txtfile_with_usefixtures_in_ini(self, testdir):
         testdir.makeini("""
             [pytest]
@@ -232,7 +227,6 @@
         reprec = testdir.inline_run(p, )
         reprec.assertoutcome(passed=1)
 
-    @xfail_if_pdbpp_installed
     def test_doctestmodule_with_fixtures(self, testdir):
         p = testdir.makepyfile("""
             '''
@@ -244,7 +238,6 @@
         reprec = testdir.inline_run(p, "--doctest-modules")
         reprec.assertoutcome(passed=1)
 
-    @xfail_if_pdbpp_installed
     def test_doctestmodule_three_tests(self, testdir):
         p = testdir.makepyfile("""
             '''
@@ -270,7 +263,6 @@
         reprec = testdir.inline_run(p, "--doctest-modules")
         reprec.assertoutcome(passed=3)
 
-    @xfail_if_pdbpp_installed
     def test_doctestmodule_two_tests_one_fail(self, testdir):
         p = testdir.makepyfile("""
             class MyClass:

diff -r 5fc366c50b56a94638c959be8456d2cb3c7e7c1c -r 0ba56c3c5ef40dabe0693d2d743cdf2b887873ec testing/test_pdb.py
--- a/testing/test_pdb.py
+++ b/testing/test_pdb.py
@@ -2,7 +2,6 @@
 import py
 import sys
 
-from test_doctest import xfail_if_pdbpp_installed
 
 class TestPDB:
     def pytest_funcarg__pdblist(self, request):
@@ -187,7 +186,6 @@
         if child.isalive():
             child.wait()
 
-    @xfail_if_pdbpp_installed
     def test_pdb_interaction_doctest(self, testdir):
         p1 = testdir.makepyfile("""
             import pytest

Repository URL: https://bitbucket.org/hpk42/pytest/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.