[pypy-commit] pypy win_ffi: fix import, assert correct exception

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: win_ffi
Changeset: r55274:163084b063d5
Date: 2012-06-02 21:48 +0300
http://bitbucket.org/pypy/pypy/changeset/163084b063d5/

Log:	fix import, assert correct exception

diff --git a/pypy/module/pypyjit/test_pypy_c/test__ffi.py b/pypy/module/pypyjit/test_pypy_c/test__ffi.py
--- a/pypy/module/pypyjit/test_pypy_c/test__ffi.py
+++ b/pypy/module/pypyjit/test_pypy_c/test__ffi.py
@@ -74,7 +74,7 @@
         assert opnames.count('new_with_vtable') == 1
 
     def test__ffi_call_releases_gil(self):
-        from pypy.rlib.test.test_libffi import get_libc_name
+        from pypy.rlib.clibffi import get_libc_name
         def main(libc_name, n):
             import time
             import os
diff --git a/pypy/rlib/test/test_libffi.py b/pypy/rlib/test/test_libffi.py
--- a/pypy/rlib/test/test_libffi.py
+++ b/pypy/rlib/test/test_libffi.py
@@ -569,9 +569,9 @@
             except ValueError, e:
                 assert e.message == 'Procedure called with not enough ' + \
                      'arguments (8 bytes missing) or wrong calling convention'
-            except LLException:
+            except LLException, e:
                 #jitted code raises this
-                pass
+                assert str(e) == "<LLException 'StackCheckError'>"
             else:
                 assert 0, 'wrong calling convention should have raised'