Author: Alexander Hesse <[email protected]>
Branch: split-rpython
Changeset: r60095:56313bbca2ea
Date: 2013-01-15 19:20 +0100
http://bitbucket.org/pypy/pypy/changeset/56313bbca2ea/
Log: merge
diff --git a/pypy/pytest.ini b/pytest.ini
rename from pypy/pytest.ini
rename to pytest.ini
diff --git a/rpython/annotator/test/test_annrpython.py
b/rpython/annotator/test/test_annrpython.py
--- a/rpython/annotator/test/test_annrpython.py
+++ b/rpython/annotator/test/test_annrpython.py
@@ -3655,7 +3655,7 @@
cls = C
return cls().foo
a = self.RPythonAnnotator()
- raises(Exception, a.build_types, f, [int])
+ py.test.raises(Exception, a.build_types, f, [int])
def test_range_variable_step(self):
def g(n):
diff --git a/rpython/pytest.ini b/rpython/pytest.ini
new file mode 100644
--- /dev/null
+++ b/rpython/pytest.ini
@@ -0,0 +1,2 @@
+[pytest]
+addopts = --assert=reinterp -rf
diff --git a/rpython/rtyper/lltypesystem/module/test/test_ll_math.py
b/rpython/rtyper/lltypesystem/module/test/test_ll_math.py
--- a/rpython/rtyper/lltypesystem/module/test/test_ll_math.py
+++ b/rpython/rtyper/lltypesystem/module/test/test_ll_math.py
@@ -296,7 +296,7 @@
assert expected == OverflowError, "%s: got an OverflowError" % (
repr,)
else:
- if not (expected)(got):
+ if not get_tester(expected)(got):
raise AssertionError("%r: got %r, expected %r" %
(repr, got, expected))
#
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
