fix issue75 - test failure on jython.
also experimentally enable more tests in the jython test env.
This commit is contained in:
parent
be249dcfe5
commit
3bd3ba133f
|
@ -2,6 +2,7 @@ Changes between 2.1.2 and [next version]
|
|||
----------------------------------------
|
||||
|
||||
- fix issue67 / junitxml now contains correct test durations, thanks ronny
|
||||
- fix issue75 / skipping test failure on jython
|
||||
|
||||
Changes between 2.1.1 and 2.1.2
|
||||
----------------------------------------
|
||||
|
|
|
@ -25,6 +25,7 @@ def pytest_configure(config):
|
|||
_pytest_fullpath
|
||||
except NameError:
|
||||
_pytest_fullpath = os.path.abspath(pytest.__file__.rstrip("oc"))
|
||||
_pytest_fullpath = _pytest_fullpath.replace("$py.class", ".py")
|
||||
|
||||
def pytest_funcarg___pytest(request):
|
||||
return PytestArg(request)
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
import pytest
|
||||
import sys
|
||||
|
||||
from _pytest.skipping import MarkEvaluator, folded_skips
|
||||
from _pytest.skipping import pytest_runtest_setup
|
||||
|
@ -486,6 +487,10 @@ def test_errors_in_xfail_skip_expressions(testdir):
|
|||
pass
|
||||
""")
|
||||
result = testdir.runpytest()
|
||||
markline = " ^"
|
||||
if sys.platform.startswith("java"):
|
||||
# XXX report this to java
|
||||
markline = "*" + markline[8:]
|
||||
result.stdout.fnmatch_lines([
|
||||
"*ERROR*test_nameerror*",
|
||||
"*evaluating*skipif*expression*",
|
||||
|
@ -493,7 +498,7 @@ def test_errors_in_xfail_skip_expressions(testdir):
|
|||
"*ERROR*test_syntax*",
|
||||
"*evaluating*xfail*expression*",
|
||||
" syntax error",
|
||||
" ^",
|
||||
markline,
|
||||
"SyntaxError: invalid syntax",
|
||||
"*1 pass*2 error*",
|
||||
])
|
||||
|
|
Loading…
Reference in New Issue