From e19f3c260f9eb9756cca83e1cc96a0fa760bad46 Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marc@marc-abramowitz.com>
Date: Thu, 19 Feb 2015 03:03:56 -0800
Subject: [PATCH 1/2] Remove pdbpp xfails; don't seem necessary anymore

It seems that they're no longer necessary as the tests pass now

    [marca@marca-mac2 pytest]$ pip freeze
    backports.inspect==0.0.2
    fancycompleter==0.4
    funcsigs==0.2
    ordereddict==1.1
    -e hg+ssh://hg@bitbucket.org/antocuni/pdb@4bda65ac8f8cc9b1850e0301669aac39200f2f9a#egg=pdbpp-fix_pytest_doctest_NoneType_object_has_no_attribute_lower
    py==1.4.26
    Pygments==1.6
    pyrepl==0.8.4
    -e hg+ssh://hg@bitbucket.org/hpk42/pytest@5fc366c50b56a94638c959be8456d2cb3c7e7c1c#egg=pytest-dev
    wmctrl==0.1
    [marca@marca-mac2 pytest]$ py.test testing/test_doctest.py --tb=short
    ============================================================================= test session starts ==============================================================================
    platform darwin -- Python 2.7.9 -- py-1.4.26 -- pytest-2.7.0.dev1
    collected 22 items

    testing/test_doctest.py ......................

    ========================================================================== 22 passed in 1.61 seconds ===========================================================================

See https://bitbucket.org/antocuni/pdb/issue/24/doctests-fail-when-pdbpp-is-installed

--HG--
branch : remove_pdbpp_xfail
---
 testing/test_doctest.py | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/testing/test_doctest.py b/testing/test_doctest.py
index aa1795874..80a861bfc 100644
--- a/testing/test_doctest.py
+++ b/testing/test_doctest.py
@@ -3,8 +3,6 @@ import py, pytest
 
 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 @@ class TestDoctests:
         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 @@ class TestDoctests:
             "*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 @@ class TestDoctests:
         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 @@ class TestDoctests:
         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 @@ class TestDoctests:
         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 @@ class TestDoctests:
         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:

From 777bde7c604ad5ae70dfb25632fe621255b40b84 Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marc@marc-abramowitz.com>
Date: Thu, 19 Feb 2015 03:22:05 -0800
Subject: [PATCH 2/2] Remove xfail_if_pdbpp_installed from test_pdb.py

--HG--
branch : remove_pdbpp_xfail
---
 testing/test_pdb.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/testing/test_pdb.py b/testing/test_pdb.py
index cc1f1e10e..f0cf2b333 100644
--- 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 @@ class TestPDB:
         if child.isalive():
             child.wait()
 
-    @xfail_if_pdbpp_installed
     def test_pdb_interaction_doctest(self, testdir):
         p1 = testdir.makepyfile("""
             import pytest