Commit d8b15dd9 by Sébastien Eustace

Fix tests

parent 1da0690c
...@@ -52,9 +52,8 @@ class Repository(BaseRepository): ...@@ -52,9 +52,8 @@ class Repository(BaseRepository):
continue continue
reqs = package.extras[extra] reqs = package.extras[extra]
for req in reqs: for req in reqs:
if req == dep.name: if req.name == dep.name:
dep.activate() dep.activate()
packages.append(package) packages.append(package)
......
...@@ -261,7 +261,7 @@ def test_add_constraint_with_extras(app, repo, installer): ...@@ -261,7 +261,7 @@ def test_add_constraint_with_extras(app, repo, installer):
cachy2 = get_package('cachy', '0.2.0') cachy2 = get_package('cachy', '0.2.0')
cachy2.extras = { cachy2.extras = {
'msgpack': ['msgpack-python'] 'msgpack': [get_dependency('msgpack-python')]
} }
msgpack_dep = get_dependency('msgpack-python', '>=0.5 <0.6', optional=True) msgpack_dep = get_dependency('msgpack-python', '>=0.5 <0.6', optional=True)
cachy2.requires = [ cachy2.requires = [
......
...@@ -370,6 +370,7 @@ def test_run_with_dependencies_extras(installer, locker, repo, package): ...@@ -370,6 +370,7 @@ def test_run_with_dependencies_extras(installer, locker, repo, package):
package_b.extras = { package_b.extras = {
'foo': [get_dependency('C', '^1.0')] 'foo': [get_dependency('C', '^1.0')]
} }
package_b.add_dependency('C', {'version': '^1.0', 'optional': True})
repo.add_package(package_a) repo.add_package(package_a)
repo.add_package(package_b) repo.add_package(package_b)
......
...@@ -424,6 +424,7 @@ def test_solver_returns_extras_if_requested(solver, repo): ...@@ -424,6 +424,7 @@ def test_solver_returns_extras_if_requested(solver, repo):
package_b.extras = { package_b.extras = {
'foo': [get_dependency('C', '^1.0')] 'foo': [get_dependency('C', '^1.0')]
} }
package_b.add_dependency('C', {'version': '^1.0', 'optional': True})
repo.add_package(package_a) repo.add_package(package_a)
repo.add_package(package_b) repo.add_package(package_b)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment