Author: Manuel Jacob
Branch: refactor-buffer-api
Changeset: r66680:1ec5a5fa19da
Date: 2013-08-30 18:11 +0100
http://bitbucket.org/pypy/pypy/changeset/1ec5a5fa19da/
Log: Backed out changeset a6099e49c9ec: Carl thinks that this should be
done when the verbose option is active. I'll implement that in
default.
diff --git a/pypy/conftest.py b/pypy/conftest.py
--- a/pypy/conftest.py
+++ b/pypy/conftest.py
@@ -36,7 +36,7 @@
def pytest_addoption(parser):
from rpython.conftest import pytest_addoption
pytest_addoption(parser)
-
+
group = parser.getgroup("pypy options")
group.addoption('-A', '--runappdirect', action="store_true",
default=False, dest="runappdirect",
@@ -44,9 +44,6 @@
group.addoption('--direct', action="store_true",
default=False, dest="rundirect",
help="run pexpect tests directly")
- group.addoption('--raise-operr', action="store_true",
- default=False, dest="raise_operr",
- help="Show the interp-level OperationError in app-level tests")
def pytest_funcarg__space(request):
from pypy.tool.pytest.objspace import gettestobjspace
diff --git a/pypy/tool/pytest/apptest.py b/pypy/tool/pytest/apptest.py
--- a/pypy/tool/pytest/apptest.py
+++ b/pypy/tool/pytest/apptest.py
@@ -34,8 +34,6 @@
try:
target(*args)
except OperationError, e:
- if self.config.option.raise_operr:
- raise
tb = sys.exc_info()[2]
if e.match(space, space.w_KeyboardInterrupt):
raise KeyboardInterrupt, KeyboardInterrupt(), tb
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
