diff options
| author | Robert Collins <rbtcollins@hp.com> | 2015-04-22 11:53:05 +1200 |
|---|---|---|
| committer | Robert Collins <rbtcollins@hp.com> | 2015-04-24 16:14:48 +1200 |
| commit | 582af6e684616bcdf2fe120b032d1f84cb55157f (patch) | |
| tree | e35053b02846c90722251117a481f41c3834ea87 /tests/functional | |
| parent | ff1206fa83782cf7f3b6430e6f96d9795d5e3308 (diff) | |
| download | pip-582af6e684616bcdf2fe120b032d1f84cb55157f.tar.gz | |
Issue #2677: Disable wheels for setup.py options.
Using --install-options, --build-options, --global-options changes
the way that setup.py behaves, and isn't honoured by the wheel code.
The new wheel autobuilding code made this very obvious - disable
the use of wheels when these options are supplied.
Diffstat (limited to 'tests/functional')
| -rw-r--r-- | tests/functional/test_install.py | 10 | ||||
| -rw-r--r-- | tests/functional/test_install_reqs.py | 3 |
2 files changed, 7 insertions, 6 deletions
diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py index 96542b7a6..529035e71 100644 --- a/tests/functional/test_install.py +++ b/tests/functional/test_install.py @@ -304,7 +304,7 @@ def test_install_global_option(script): """ result = script.pip( 'install', '--global-option=--version', "INITools==0.1", - ) + expect_stderr=True) assert '0.1\n' in result.stdout @@ -335,8 +335,8 @@ def test_install_using_install_option_and_editable(script, tmpdir): result = script.pip( 'install', '-e', '%s#egg=pip-test-package' % local_checkout(url, tmpdir.join("cache")), - '--install-option=--script-dir=%s' % folder - ) + '--install-option=--script-dir=%s' % folder, + expect_stderr=True) script_file = ( script.venv / 'src' / 'pip-test-package' / folder / 'pip-test-package' + script.exe @@ -352,8 +352,8 @@ def test_install_global_option_using_editable(script, tmpdir): url = 'hg+http://bitbucket.org/runeh/anyjson' result = script.pip( 'install', '--global-option=--version', '-e', - '%s@0.2.5#egg=anyjson' % local_checkout(url, tmpdir.join("cache")) - ) + '%s@0.2.5#egg=anyjson' % local_checkout(url, tmpdir.join("cache")), + expect_stderr=True) assert 'Successfully installed anyjson' in result.stdout diff --git a/tests/functional/test_install_reqs.py b/tests/functional/test_install_reqs.py index 318d216ee..c227dcf7b 100644 --- a/tests/functional/test_install_reqs.py +++ b/tests/functional/test_install_reqs.py @@ -187,7 +187,8 @@ def test_install_option_in_requirements_file(script, data, virtualenv): result = script.pip( 'install', '--no-index', '-f', data.find_links, '-r', script.scratch_path / 'reqs.txt', - '--install-option=--home=%s' % script.scratch_path.join("home2")) + '--install-option=--home=%s' % script.scratch_path.join("home2"), + expect_stderr=True) package_dir = script.scratch / 'home1' / 'lib' / 'python' / 'simple' assert package_dir in result.files_created |