McSinyx
/
pip
mirror of https://github.com/pypa/pip
1
1
Fork 0
Code Issues Releases Activity

Fix some missing find_links -> data.find_links switches

This commit is contained in:
Donald Stufft 2013-08-23 07:49:04 -04:00
parent 1bd8dd99f8
commit 1650d4166a
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/functional/test_install_config.py
View File

@ -62,7 +62,7 @@ def _test_env_vars_override_config_file(script, virtualenv, config_file):
assert "Successfully installed INITools" in result.stdout
def test_command_line_append_flags(script, virtualenv):
def test_command_line_append_flags(script, virtualenv, data):
"""
Test command line flags that append to defaults set by environmental variables.
@ -71,21 +71,21 @@ def test_command_line_append_flags(script, virtualenv):
result = script.pip('install', '-vvv', 'INITools', expect_error=True)
assert "Analyzing links from page http://pypi.pinaxproject.com" in result.stdout
virtualenv.clear()
result = script.pip('install', '-vvv', '--find-links', find_links, 'INITools', expect_error=True)
result = script.pip('install', '-vvv', '--find-links', data.find_links, 'INITools', expect_error=True)
assert "Analyzing links from page http://pypi.pinaxproject.com" in result.stdout
assert "Skipping link %s" % find_links in result.stdout
assert "Skipping link %s" % data.find_links in result.stdout
def test_command_line_appends_correctly(script):
def test_command_line_appends_correctly(script, data):
"""
Test multiple appending options set by environmental variables.
"""
script.environ['PIP_FIND_LINKS'] = 'http://pypi.pinaxproject.com %s' % find_links
script.environ['PIP_FIND_LINKS'] = 'http://pypi.pinaxproject.com %s' % data.find_links
result = script.pip('install', '-vvv', 'INITools', expect_error=True)
assert "Analyzing links from page http://pypi.pinaxproject.com" in result.stdout, result.stdout
assert "Skipping link %s" % find_links in result.stdout
assert "Skipping link %s" % data.find_links in result.stdout
def test_config_file_override_stack(script, virtualenv):

4
tests/unit/test_req.py
View File

@ -35,7 +35,7 @@ class TestRequirementSet(object):
download_cache=os.path.join(self.tempdir, 'download_cache')
)
def test_no_reuse_existing_build_dir(self):
def test_no_reuse_existing_build_dir(self, data):
"""Test prepare_files raise exception with previous build dir"""
build_dir = os.path.join(self.tempdir, 'build', 'simple')
@ -44,7 +44,7 @@ class TestRequirementSet(object):
reqset = self.basic_reqset()
req = InstallRequirement.from_line('simple')
reqset.add_requirement(req)
finder = PackageFinder([find_links], [])
finder = PackageFinder([data.find_links], [])
assert_raises_regexp(
PreviousBuildDirError,
"pip can't proceed with [\s\S]*%s[\s\S]*%s" % (req, build_dir.replace('\\', '\\\\')),