[pypy-commit] pypy default: reimport cffi

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: 
Changeset: r62944:3a51f6849889
Date: 2013-04-03 09:47 +0200
http://bitbucket.org/pypy/pypy/changeset/3a51f6849889/

Log:	reimport cffi

diff --git a/pypy/module/test_lib_pypy/cffi_tests/test_zintegration.py b/pypy/module/test_lib_pypy/cffi_tests/test_zintegration.py
--- a/pypy/module/test_lib_pypy/cffi_tests/test_zintegration.py
+++ b/pypy/module/test_lib_pypy/cffi_tests/test_zintegration.py
@@ -3,6 +3,18 @@
 import subprocess
 from pypy.module.test_lib_pypy.cffi_tests.udir import udir
 
+def setup_module(mod):
+    if '__pypy__' in sys.builtin_module_names:
+        try:
+            ver = subprocess.check_output(['virtualenv', '--version'])
+        except OSError as e:
+            py.test.skip("Cannot execute virtualenv: %s" % (e,))
+        # this check is absolutely broken, but I can't think about a better
+        # idea
+        if ((ver.startswith('1.9') and ver <= "1.9.1") or
+            ver[2] != '1'):
+            py.test.skip("pypy requires virtualenv >= 1.9.2")
+
 def create_venv(name):
     tmpdir = udir.join(name)
     try: