Author: Maciej Fijalkowski <[email protected]>
Branch: kill-someobject
Changeset: r58051:a317cb5950c9
Date: 2012-10-12 16:29 +0200
http://bitbucket.org/pypy/pypy/changeset/a317cb5950c9/
Log: small fixes
diff --git a/pypy/tool/test/test_error.py b/pypy/tool/test/test_error.py
--- a/pypy/tool/test/test_error.py
+++ b/pypy/tool/test/test_error.py
@@ -72,5 +72,5 @@
try:
compile_function(fn, [int])
except UnionError, e:
- assert 'function one' in e.args[2]
- assert 'function two' in e.args[2]
+ assert 'function one' in str(e)
+ assert 'function two' in str(e)
diff --git a/pypy/translator/c/test/test_genc.py
b/pypy/translator/c/test/test_genc.py
--- a/pypy/translator/c/test/test_genc.py
+++ b/pypy/translator/c/test/test_genc.py
@@ -19,7 +19,7 @@
unsigned_ffffffff = r_ulonglong(0xffffffff)
def llrepr_in(v):
- if isinstance(v, r_ulonglong):
+ if r_uint is not r_ulonglong and isinstance(v, r_ulonglong):
return "%d:%d" % (intmask(v >> 32), intmask(v & unsigned_ffffffff))
elif isinstance(v, r_longlong):
return "%d:%d" % (intmask(v >> 32), intmask(v & signed_ffffffff))
@@ -98,6 +98,8 @@
except AttributeError:
pass
t.rtype()
+ if backendopt:
+ t.backendopt()
try:
if py.test.config.option.view:
t.view()
@@ -132,8 +134,10 @@
print '--- stderr ---'
output(stderr)
print '--------------'
- stderr, lastline, empty = stderr.rsplit('\n', 2)
+ stderr, prevline, lastline, empty = stderr.rsplit('\n', 3)
assert empty == ''
+ if lastline == 'Aborted':
+ lastline = prevline
assert lastline == ('Fatal RPython error: ' +
expected_exception_name)
return None
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
