Author: Maciej Fijalkowski <fij...@gmail.com>
Branch: kill-someobject
Changeset: r58072:da5f9d700d45
Date: 2012-10-12 18:27 +0200
http://bitbucket.org/pypy/pypy/changeset/da5f9d700d45/
Log: merge
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
@@ -138,10 +138,8 @@
print '--------------'
stderr, prevline, lastline, empty = stderr.rsplit('\n', 3)
assert empty == ''
- if lastline == 'Aborted':
- lastline = prevline
- assert lastline == ('Fatal RPython error: ' +
- expected_exception_name)
+ expected = 'Fatal RPython error: ' + expected_exception_name
+ assert lastline == expected or prevline == expected
return None
output(stdout)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
