Author: Ronny Pfannschmidt <[email protected]>
Branch: split-rpython
Changeset: r60128:59bc9f371b06
Date: 2013-01-17 10:57 +0100
http://bitbucket.org/pypy/pypy/changeset/59bc9f371b06/
Log: Backed out changeset 1bcb31da666a, defer the fix to pytest
diff --git a/rpython/conftest.py b/rpython/conftest.py
--- a/rpython/conftest.py
+++ b/rpython/conftest.py
@@ -2,6 +2,12 @@
import py, pytest
from rpython.tool import leakfinder
+# XXX
+# <ronny> Aquana, i just ensured that with the pypy conftest we get all skips,
+# i'll investigate differences in collection tommorow, for now, can you just
+# import the makemodule hook from pypy and add a comment that im responsible
+# for fixing?
+from pypy.conftest import pytest_pycollect_makemodule
cdir = realpath(join(dirname(__file__), 'translator', 'c'))
cache_dir = realpath(join(dirname(__file__), '_cache'))
diff --git a/rpython/translator/jvm/test/runtest.py
b/rpython/translator/jvm/test/runtest.py
--- a/rpython/translator/jvm/test/runtest.py
+++ b/rpython/translator/jvm/test/runtest.py
@@ -98,9 +98,10 @@
FLOAT_PRECISION = 7
- _func = None
- _ann = None
- _jvm_src = None
+ def __init__(self):
+ self._func = None
+ self._ann = None
+ self._jvm_src = None
def compile(self, fn, args, ann=None, backendopt=False):
if ann is None:
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
