[Pytest-commit] commit/pytest: 3 new changesets
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Thu Feb 19 12:42:28 CET 2015
3 new commits in pytest:
https://bitbucket.org/hpk42/pytest/commits/08d9303d9afa/
Changeset: 08d9303d9afa
Branch: remove_pdbpp_xfail
User: msabramo
Date: 2015-02-19 11:03:56+00:00
Summary: Remove pdbpp xfails; don't seem necessary anymore
It seems that they're no longer necessary as the tests pass now
[marca at 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 at 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
Affected #: 1 file
diff -r 5fc366c50b56a94638c959be8456d2cb3c7e7c1c -r 08d9303d9afa51a3c13d0300e7a11a5da406afc2 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:
https://bitbucket.org/hpk42/pytest/commits/ed05c00ee11f/
Changeset: ed05c00ee11f
Branch: remove_pdbpp_xfail
User: msabramo
Date: 2015-02-19 11:22:05+00:00
Summary: Remove xfail_if_pdbpp_installed from test_pdb.py
Affected #: 1 file
diff -r 08d9303d9afa51a3c13d0300e7a11a5da406afc2 -r ed05c00ee11f08a8e8418144680bf4d2d3a66af1 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
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.
More information about the pytest-commit
mailing list