1 new changeset in pytest:
http://bitbucket.org/hpk42/pytest/changeset/aa13be7382e9/
changeset: aa13be7382e9
user: hpk42
date: 2011-09-21 08:12:37
summary: try to make test suite pass on jython 2.5.1 again
affected #: 4 files (-1 bytes)
--- a/testing/acceptance_test.py Wed Sep 21 07:52:41 2011 +0200
+++ b/testing/acceptance_test.py Wed Sep 21 08:12:37 2011 +0200
@@ -281,6 +281,7 @@
result = testdir.runpython(p)
assert result.ret == 0
+ @pytest.mark.xfail("sys.platform.startswith('java')")
def test_pydoc(self, testdir):
for name in ('py.test', 'pytest'):
result = testdir.runpython_c("import %s;help(%s)" % (name, name))
--- a/testing/test_assertion.py Wed Sep 21 07:52:41 2011 +0200
+++ b/testing/test_assertion.py Wed Sep 21 08:12:37 2011 +0200
@@ -235,7 +235,7 @@
"*test_traceback_failure.py:4: AssertionError"
])
-@pytest.mark.skipif("sys.version_info < (2,5) or '__pypy__' in
sys.builtin_module_names")
+@pytest.mark.skipif("sys.version_info < (2,5) or '__pypy__' in
sys.builtin_module_names or sys.platform.startswith('java')" )
def test_warn_missing(testdir):
p1 = testdir.makepyfile("")
result = testdir.run(sys.executable, "-OO", "-m", "pytest", "-h")
--- a/testing/test_assertrewrite.py Wed Sep 21 07:52:41 2011 +0200
+++ b/testing/test_assertrewrite.py Wed Sep 21 08:12:37 2011 +0200
@@ -4,6 +4,9 @@
import pytest
ast = pytest.importorskip("ast")
+if sys.platform.startswith("java"):
+ # XXX should be xfail
+ pytest.skip("assert rewrite does currently not work on jython")
from _pytest.assertion import util
from _pytest.assertion.rewrite import rewrite_asserts
--- a/testing/test_conftest.py Wed Sep 21 07:52:41 2011 +0200
+++ b/testing/test_conftest.py Wed Sep 21 08:12:37 2011 +0200
@@ -89,7 +89,7 @@
assert value == 1.5
path = py.path.local(mod.__file__)
assert path.dirpath() == basedir.join("adir", "b")
- assert path.purebasename == "conftest"
+ assert path.purebasename.startswith("conftest")
def test_conftest_in_nonpkg_with_init(tmpdir):
tmpdir.ensure("adir-1.0/conftest.py").write("a=1 ; Directory = 3")
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.
_______________________________________________
py-svn mailing list
py-svn@codespeak.net
http://codespeak.net/mailman/listinfo/py-svn
