mirror of https://github.com/pypa/pip
Update unit tests for the changes
This commit is contained in:
parent
055dcb8daf
commit
146c3900d4
|
@ -24,6 +24,12 @@ from pip._internal.utils.misc import read_text_file
|
|||
from tests.lib import DATA_DIR, assert_raises_regexp, requirements_file
|
||||
|
||||
|
||||
def get_processed_req_from_line(line, fname='file', lineno=1):
|
||||
req = list(process_line(line, fname, lineno))[0]
|
||||
req.is_direct = True
|
||||
return req
|
||||
|
||||
|
||||
class TestRequirementSet(object):
|
||||
"""RequirementSet tests"""
|
||||
|
||||
|
@ -58,6 +64,7 @@ class TestRequirementSet(object):
|
|||
open(os.path.join(build_dir, "setup.py"), 'w')
|
||||
reqset = RequirementSet()
|
||||
req = InstallRequirement.from_line('simple')
|
||||
req.is_direct = True
|
||||
reqset.add_requirement(req)
|
||||
finder = PackageFinder([data.find_links], [], session=PipSession())
|
||||
resolver = self._basic_resolver(finder)
|
||||
|
@ -76,7 +83,9 @@ class TestRequirementSet(object):
|
|||
"""
|
||||
reqset = RequirementSet()
|
||||
req = InstallRequirement.from_editable(
|
||||
data.packages.join("LocalEnvironMarker"))
|
||||
data.packages.join("LocalEnvironMarker")
|
||||
)
|
||||
req.is_direct = True
|
||||
reqset.add_requirement(req)
|
||||
finder = PackageFinder([data.find_links], [], session=PipSession())
|
||||
resolver = self._basic_resolver(finder)
|
||||
|
@ -95,28 +104,30 @@ class TestRequirementSet(object):
|
|||
reqset = RequirementSet()
|
||||
# No flags here. This tests that detection of later flags nonetheless
|
||||
# requires earlier packages to have hashes:
|
||||
reqset.add_requirement(
|
||||
list(process_line('blessings==1.0', 'file', 1))[0])
|
||||
reqset.add_requirement(get_processed_req_from_line(
|
||||
'blessings==1.0', lineno=1
|
||||
))
|
||||
# This flag activates --require-hashes mode:
|
||||
reqset.add_requirement(
|
||||
list(process_line('tracefront==0.1 --hash=sha256:somehash',
|
||||
'file',
|
||||
2))[0])
|
||||
reqset.add_requirement(get_processed_req_from_line(
|
||||
'tracefront==0.1 --hash=sha256:somehash', lineno=2,
|
||||
))
|
||||
# This hash should be accepted because it came from the reqs file, not
|
||||
# from the internet:
|
||||
reqset.add_requirement(
|
||||
list(process_line('https://pypi.python.org/packages/source/m/more-'
|
||||
'itertools/more-itertools-1.0.tar.gz#md5=b21850c'
|
||||
'3cfa7efbb70fd662ab5413bdd', 'file', 3))[0])
|
||||
reqset.add_requirement(get_processed_req_from_line(
|
||||
'https://pypi.python.org/packages/source/m/more-itertools/'
|
||||
'more-itertools-1.0.tar.gz#md5=b21850c3cfa7efbb70fd662ab5413bdd',
|
||||
lineno=3,
|
||||
))
|
||||
# The error text should list this as a URL and not `peep==3.1.1`:
|
||||
reqset.add_requirement(
|
||||
list(process_line('https://pypi.python.org/packages/source/p/peep/'
|
||||
'peep-3.1.1.tar.gz',
|
||||
'file',
|
||||
4))[0])
|
||||
finder = PackageFinder([],
|
||||
['https://pypi.python.org/simple'],
|
||||
session=PipSession())
|
||||
reqset.add_requirement(get_processed_req_from_line(
|
||||
'https://pypi.python.org/packages/source/p/peep/peep-3.1.1.tar.gz',
|
||||
lineno=4,
|
||||
))
|
||||
finder = PackageFinder(
|
||||
[],
|
||||
['https://pypi.python.org/simple'],
|
||||
session=PipSession(),
|
||||
)
|
||||
resolver = self._basic_resolver(finder)
|
||||
assert_raises_regexp(
|
||||
HashErrors,
|
||||
|
@ -130,17 +141,21 @@ class TestRequirementSet(object):
|
|||
r' Expected sha256 somehash\n'
|
||||
r' Got [0-9a-f]+$',
|
||||
resolver.resolve,
|
||||
reqset)
|
||||
reqset
|
||||
)
|
||||
|
||||
def test_missing_hash_with_require_hashes(self, data):
|
||||
"""Setting --require-hashes explicitly should raise errors if hashes
|
||||
are missing.
|
||||
"""
|
||||
reqset = RequirementSet(require_hashes=True)
|
||||
reqset.add_requirement(
|
||||
list(process_line('simple==1.0', 'file', 1))[0])
|
||||
reqset.add_requirement(get_processed_req_from_line(
|
||||
'simple==1.0', lineno=1
|
||||
))
|
||||
|
||||
finder = PackageFinder([data.find_links], [], session=PipSession())
|
||||
resolver = self._basic_resolver(finder)
|
||||
|
||||
assert_raises_regexp(
|
||||
HashErrors,
|
||||
r'Hashes are required in --require-hashes mode, but they are '
|
||||
|
@ -148,7 +163,8 @@ class TestRequirementSet(object):
|
|||
r' simple==1.0 --hash=sha256:393043e672415891885c9a2a0929b1af95'
|
||||
r'fb866d6ca016b42d2e6ce53619b653$',
|
||||
resolver.resolve,
|
||||
reqset)
|
||||
reqset
|
||||
)
|
||||
|
||||
def test_missing_hash_with_require_hashes_in_reqs_file(self, data, tmpdir):
|
||||
"""--require-hashes in a requirements file should make its way to the
|
||||
|
@ -162,7 +178,8 @@ class TestRequirementSet(object):
|
|||
options, args = command.parse_args(['-r', reqs_file])
|
||||
command.populate_requirement_set(
|
||||
req_set, args, options, finder, session, command.name,
|
||||
wheel_cache=None)
|
||||
wheel_cache=None,
|
||||
)
|
||||
assert req_set.require_hashes
|
||||
|
||||
def test_unsupported_hashes(self, data):
|
||||
|
@ -174,17 +191,15 @@ class TestRequirementSet(object):
|
|||
|
||||
"""
|
||||
reqset = RequirementSet(require_hashes=True)
|
||||
reqset.add_requirement(
|
||||
list(process_line(
|
||||
'git+git://github.com/pypa/pip-test-package --hash=sha256:123',
|
||||
'file',
|
||||
1))[0])
|
||||
reqset.add_requirement(get_processed_req_from_line(
|
||||
'git+git://github.com/pypa/pip-test-package --hash=sha256:123',
|
||||
lineno=1,
|
||||
))
|
||||
dir_path = data.packages.join('FSPkg')
|
||||
reqset.add_requirement(
|
||||
list(process_line(
|
||||
'file://%s' % (dir_path,),
|
||||
'file',
|
||||
2))[0])
|
||||
reqset.add_requirement(get_processed_req_from_line(
|
||||
'file://%s' % (dir_path,),
|
||||
lineno=2,
|
||||
))
|
||||
finder = PackageFinder([data.find_links], [], session=PipSession())
|
||||
resolver = self._basic_resolver(finder)
|
||||
sep = os.path.sep
|
||||
|
@ -209,17 +224,16 @@ class TestRequirementSet(object):
|
|||
"""
|
||||
reqset = RequirementSet()
|
||||
# Test that there must be exactly 1 specifier:
|
||||
reqset.add_requirement(
|
||||
list(process_line('simple --hash=sha256:a90427ae31f5d1d0d7ec06ee97'
|
||||
'd9fcf2d0fc9a786985250c1c83fd68df5911dd',
|
||||
'file',
|
||||
1))[0])
|
||||
reqset.add_requirement(get_processed_req_from_line(
|
||||
'simple --hash=sha256:a90427ae31f5d1d0d7ec06ee97d9fcf2d0fc9a786985'
|
||||
'250c1c83fd68df5911dd', lineno=1,
|
||||
))
|
||||
# Test that the operator must be ==:
|
||||
reqset.add_requirement(list(process_line(
|
||||
reqset.add_requirement(get_processed_req_from_line(
|
||||
'simple2>1.0 --hash=sha256:3ad45e1e9aa48b4462af0'
|
||||
'123f6a7e44a9115db1ef945d4d92c123dfe21815a06',
|
||||
'file',
|
||||
2))[0])
|
||||
lineno=2,
|
||||
))
|
||||
finder = PackageFinder([data.find_links], [], session=PipSession())
|
||||
resolver = self._basic_resolver(finder)
|
||||
assert_raises_regexp(
|
||||
|
@ -236,10 +250,9 @@ class TestRequirementSet(object):
|
|||
file_url = path_to_url(
|
||||
(data.packages / 'simple-1.0.tar.gz').abspath)
|
||||
reqset = RequirementSet(require_hashes=True)
|
||||
reqset.add_requirement(
|
||||
list(process_line('%s --hash=sha256:badbad' % file_url,
|
||||
'file',
|
||||
1))[0])
|
||||
reqset.add_requirement(get_processed_req_from_line(
|
||||
'%s --hash=sha256:badbad' % file_url, lineno=1,
|
||||
))
|
||||
finder = PackageFinder([data.find_links], [], session=PipSession())
|
||||
resolver = self._basic_resolver(finder)
|
||||
assert_raises_regexp(
|
||||
|
@ -258,11 +271,12 @@ class TestRequirementSet(object):
|
|||
reqset = RequirementSet()
|
||||
finder = PackageFinder([data.find_links], [], session=PipSession())
|
||||
resolver = self._basic_resolver(finder)
|
||||
reqset.add_requirement(next(process_line(
|
||||
reqset.add_requirement(get_processed_req_from_line(
|
||||
'TopoRequires2==0.0.1 ' # requires TopoRequires
|
||||
'--hash=sha256:eaf9a01242c9f2f42cf2bd82a6a848cd'
|
||||
'e3591d14f7896bdbefcf48543720c970',
|
||||
'file', 1)))
|
||||
lineno=1
|
||||
))
|
||||
assert_raises_regexp(
|
||||
HashErrors,
|
||||
r'In --require-hashes mode, all requirements must have their '
|
||||
|
@ -281,16 +295,18 @@ class TestRequirementSet(object):
|
|||
|
||||
"""
|
||||
reqset = RequirementSet()
|
||||
reqset.add_requirement(next(process_line(
|
||||
reqset.add_requirement(get_processed_req_from_line(
|
||||
'TopoRequires2==0.0.1 ' # requires TopoRequires
|
||||
'--hash=sha256:eaf9a01242c9f2f42cf2bd82a6a848cd'
|
||||
'e3591d14f7896bdbefcf48543720c970',
|
||||
'file', 1)))
|
||||
reqset.add_requirement(next(process_line(
|
||||
lineno=1
|
||||
))
|
||||
reqset.add_requirement(get_processed_req_from_line(
|
||||
'TopoRequires==0.0.1 '
|
||||
'--hash=sha256:d6dd1e22e60df512fdcf3640ced3039b3b02a56ab2cee81ebcb'
|
||||
'3d0a6d4e8bfa6',
|
||||
'file', 2)))
|
||||
lineno=2
|
||||
))
|
||||
|
||||
|
||||
@pytest.mark.parametrize(('file_contents', 'expected'), [
|
||||
|
@ -590,10 +606,12 @@ def test_exclusive_environment_markers():
|
|||
"""Make sure RequirementSet accepts several excluding env markers"""
|
||||
eq26 = InstallRequirement.from_line(
|
||||
"Django>=1.6.10,<1.7 ; python_version == '2.6'")
|
||||
eq26.is_direct = True
|
||||
ne26 = InstallRequirement.from_line(
|
||||
"Django>=1.6.10,<1.8 ; python_version != '2.6'")
|
||||
ne26.is_direct = True
|
||||
|
||||
req_set = RequirementSet('', '', '')
|
||||
req_set = RequirementSet()
|
||||
req_set.add_requirement(eq26)
|
||||
req_set.add_requirement(ne26)
|
||||
assert req_set.has_requirement('Django')
|
||||
|
|
Loading…
Reference in New Issue