turn on --user tests for pypy

tests/functional/test_install_user.py

@@ -7,8 +7,6 @@
 
 from os.path import curdir, isdir, isfile
 
-import pytest
-
 from pip.backwardcompat import uses_pycache
 
 from tests.lib.local_repos import local_checkout
@@ -35,8 +33,6 @@ def dist_in_site_packages(dist):
             os.remove(cache_path)
 
 
-# --user option is broken in pypy
-@pytest.mark.skipif("hasattr(sys, 'pypy_version_info')")
 class Tests_UserSite:
 
     def test_reset_env_system_site_packages_usersite(self, script, virtualenv):

tests/functional/test_install_wheel.py

@@ -149,8 +149,6 @@ def test_install_from_wheel_no_deps(script, data):
     assert pkg_folder not in result.files_created
 
 
-# --user option is broken in pypy
-@pytest.mark.skipif("hasattr(sys, 'pypy_version_info')")
 def test_install_user_wheel(script, virtualenv, data):
     """
     Test user install from wheel (that has a script)

tests/functional/test_uninstall_user.py

@@ -3,14 +3,10 @@
 """
 from os.path import isdir, isfile
 
-import pytest
-
 from tests.lib import pyversion, assert_all_changes
 from tests.functional.test_install_user import _patch_dist_in_site_packages
 
 
-# --user option is broken in pypy
-@pytest.mark.skipif("hasattr(sys, 'pypy_version_info')")
 class Tests_UninstallUserSite:
 
     def test_uninstall_from_usersite(self, script, virtualenv):

tests/lib/__init__.py

@@ -234,6 +234,9 @@ def __init__(self, base_path, *args, **kwargs):
         # Store paths related to the virtual environment
         _virtualenv = kwargs.pop("virtualenv")
         venv, lib, include, bin = virtualenv.path_locations(_virtualenv)
+        # workaround for https://github.com/pypa/virtualenv/issues/306
+        if hasattr(sys, "pypy_version_info"):
+            lib = os.path.join(venv, 'lib-python', pyversion)
         self.venv_path = venv
         self.lib_path = lib
         self.include_path = include

tests/lib/venv.py

@@ -1,6 +1,7 @@
 from __future__ import absolute_import
 
 import os
+import sys
 import subprocess
 
 import virtualenv as _virtualenv
@@ -27,6 +28,9 @@ def __init__(self, location, *args, **kwargs):
         self._system_site_packages = kwargs.pop("system_site_packages", False)
 
         home, lib, inc, bin = _virtualenv.path_locations(self.location)
+        # workaround for https://github.com/pypa/virtualenv/issues/306
+        if hasattr(sys, "pypy_version_info"):
+            lib = os.path.join(home, 'lib-python', sys.version[:3])
         self.lib = Path(lib)
         self.bin = Path(bin)