Maciej Fijalkowski avatar Maciej Fijalkowski committed a317cb5

small fixes

Comments (0)

Files changed (2)

pypy/tool/test/test_error.py

     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)

pypy/translator/c/test/test_genc.py

 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))
     except AttributeError:
         pass
     t.rtype()
+    if backendopt:
+        t.backendopt()
     try:
         if py.test.config.option.view:
             t.view()
             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
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.