Merge pull request #619 from qwcode/issue_616

pypy test fixes for issue #616 and #617

Author: pnasrat

tests/test_pip.py

@@ -314,6 +314,9 @@ def __init__(self, environ=None, use_distribute=None, sitecustomize=None):
         assert self.venv_path == virtualenv_paths[0] # sanity check
 
         for id, path in zip(('venv', 'lib', 'include', 'bin'), virtualenv_paths):
+            #fix for virtualenv issue #306
+            if hasattr(sys, "pypy_version_info") and id == 'lib':
+                path = os.path.join(self.venv_path, 'lib-python', pyversion)
             setattr(self, id+'_path', Path(path))
             setattr(self, id, relpath(self.root_path, path))
 
@@ -444,6 +447,9 @@ def __init__(self, environ=None, sitecustomize=None):
         virtualenv_paths = virtualenv.path_locations(self.venv_path)
 
         for id, path in zip(('venv', 'lib', 'include', 'bin'), virtualenv_paths):
+            #fix for virtualenv issue #306
+            if hasattr(sys, "pypy_version_info") and id == 'lib':
+                path = os.path.join(self.venv_path, 'lib-python', pyversion)
             setattr(self, id+'_path', Path(path))
             setattr(self, id, relpath(self.root_path, path))
 

tests/test_user_site.py

@@ -35,6 +35,10 @@ def setup(self):
         # --user only works on 2.6 or higher
         if sys.version_info < (2, 6):
             raise SkipTest()
+        # --user option is broken in pypy
+        if hasattr(sys, "pypy_version_info"):
+            raise SkipTest()
+
 
     def test_reset_env_system_site_packages_usersite(self):
         """
@@ -66,9 +70,6 @@ def test_install_subversion_usersite_editable_with_distribute(self):
         """
         Test installing current directory ('.') into usersite after installing distribute
         """
-        # FIXME distutils --user option seems to be broken in pypy
-        if hasattr(sys, "pypy_version_info"):
-            raise SkipTest()
         env = reset_env(use_distribute=True, system_site_packages=True)
         result = run_pip('install', '--user', '-e',
                          '%s#egg=initools-dev' %
@@ -80,9 +81,6 @@ def test_install_curdir_usersite(self):
         """
         Test installing current directory ('.') into usersite
         """
-        # FIXME distutils --user option seems to be broken in pypy
-        if hasattr(sys, "pypy_version_info"):
-            raise SkipTest()
         env = reset_env(use_distribute=True, system_site_packages=True)
         run_from = abspath(join(here, 'packages', 'FSPkg'))
         result = run_pip('install', '--user', curdir, cwd=run_from, expect_error=False)