Skip to content

Commit 9974f27

Browse files
committedDec 16, 2015
Merge pull request pypa#3306 from xavfernandez/fix_user_site_tests_with_wheel
Fix tests when wheel is available in global site packages
2 parents 441d0cf + 9457300 commit 9974f27

File tree

2 files changed

+16
-11
lines changed

2 files changed

+16
-11
lines changed
 

‎tests/functional/test_install_user.py

+13-9
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,10 @@ def test_install_user_conflict_in_usersite(self, script, virtualenv):
113113
"""
114114
virtualenv.system_site_packages = True
115115

116-
script.pip('install', '--user', 'INITools==0.3')
116+
script.pip('install', '--user', 'INITools==0.3', '--no-binary=:all:')
117117

118-
result2 = script.pip('install', '--user', 'INITools==0.1')
118+
result2 = script.pip(
119+
'install', '--user', 'INITools==0.1', '--no-binary=:all:')
119120

120121
# usersite has 0.1
121122
egg_info_folder = (
@@ -151,9 +152,10 @@ def test_install_user_conflict_in_globalsite(self, script, virtualenv):
151152
script.environ["PYTHONPATH"] = script.base_path / script.user_site
152153
_patch_dist_in_site_packages(script)
153154

154-
script.pip('install', 'INITools==0.2')
155+
script.pip('install', 'INITools==0.2', '--no-binary=:all:')
155156

156-
result2 = script.pip('install', '--user', 'INITools==0.1')
157+
result2 = script.pip(
158+
'install', '--user', 'INITools==0.1', '--no-binary=:all:')
157159

158160
# usersite has 0.1
159161
egg_info_folder = (
@@ -194,8 +196,9 @@ def test_upgrade_user_conflict_in_globalsite(self, script, virtualenv):
194196
script.environ["PYTHONPATH"] = script.base_path / script.user_site
195197
_patch_dist_in_site_packages(script)
196198

197-
script.pip('install', 'INITools==0.2')
198-
result2 = script.pip('install', '--user', '--upgrade', 'INITools')
199+
script.pip('install', 'INITools==0.2', '--no-binary=:all:')
200+
result2 = script.pip(
201+
'install', '--user', '--upgrade', 'INITools', '--no-binary=:all:')
199202

200203
# usersite has 0.3.1
201204
egg_info_folder = (
@@ -237,10 +240,11 @@ def test_install_user_conflict_in_globalsite_and_usersite(
237240
script.environ["PYTHONPATH"] = script.base_path / script.user_site
238241
_patch_dist_in_site_packages(script)
239242

240-
script.pip('install', 'INITools==0.2')
241-
script.pip('install', '--user', 'INITools==0.3')
243+
script.pip('install', 'INITools==0.2', '--no-binary=:all:')
244+
script.pip('install', '--user', 'INITools==0.3', '--no-binary=:all:')
242245

243-
result3 = script.pip('install', '--user', 'INITools==0.1')
246+
result3 = script.pip(
247+
'install', '--user', 'INITools==0.1', '--no-binary=:all:')
244248

245249
# usersite has 0.1
246250
egg_info_folder = (

‎tests/functional/test_uninstall_user.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,10 @@ def test_uninstall_from_usersite_with_dist_in_global_site(
4141
script.environ["PYTHONPATH"] = script.base_path / script.user_site
4242
_patch_dist_in_site_packages(script)
4343

44-
script.pip_install_local('pip-test-package==0.1')
44+
script.pip_install_local('pip-test-package==0.1', '--no-binary=:all:')
4545

46-
result2 = script.pip_install_local('--user', 'pip-test-package==0.1.1')
46+
result2 = script.pip_install_local(
47+
'--user', 'pip-test-package==0.1.1', '--no-binary=:all:')
4748
result3 = script.pip('uninstall', '-vy', 'pip-test-package')
4849

4950
# uninstall console is mentioning user scripts, but not global scripts

0 commit comments

Comments
 (0)
Please sign in to comment.