Skip to content

P
python-poetry
Commit 314fc27c by Arun Babu Neelicattu Committed by finswimmer
Options

tests/solver: validate correct packages 

Prior to this change, when checking solver results the tests cases
relied on the weaker equality check of the `Package` class. With
python-poetry/poetry-core#53, the check has been made stricter.

This change, while having no functional impact, ensures that once
poetry-core is updated, tests do not fail unexpectedly.
parent 96a8214e
Showing with 62 additions and 45 deletions
tests/puzzle/test_solver.py
...@@ -902,12 +902,14 @@ def test_solver_can_resolve_git_dependencies(solver, repo, package): ...@@ -902,12 +902,14 @@ def test_solver_can_resolve_git_dependencies(solver, repo, package):
ops = solver.solve() ops = solver.solve()
demo = get_package("demo", "0.1.2")
demo.source_type = "git"
demo.source_url = "https://github.com/demo/demo.git"
demo.source_reference = "9cf87a285a2d3fbb0b9fa621997b3acc3631ed24"
check_solver_result( check_solver_result(
ops, ops,
[ [{"job": "install", "package": pendulum}, {"job": "install", "package": demo}],
{"job": "install", "package": pendulum},
{"job": "install", "package": get_package("demo", "0.1.2")},
],
) )
op = ops[1] op = ops[1]
...@@ -928,12 +930,17 @@ def test_solver_can_resolve_git_dependencies_with_extras(solver, repo, package): ...@@ -928,12 +930,17 @@ def test_solver_can_resolve_git_dependencies_with_extras(solver, repo, package):
ops = solver.solve() ops = solver.solve()
demo = get_package("demo", "0.1.2")
demo.source_type = "git"
demo.source_url = "https://github.com/demo/demo.git"
demo.source_reference = "9cf87a285a2d3fbb0b9fa621997b3acc3631ed24"
check_solver_result( check_solver_result(
ops, ops,
[ [
{"job": "install", "package": cleo}, {"job": "install", "package": cleo},
{"job": "install", "package": pendulum}, {"job": "install", "package": pendulum},
{"job": "install", "package": get_package("demo", "0.1.2")}, {"job": "install", "package": demo},
], ],
) )
...@@ -949,7 +956,12 @@ def test_solver_can_resolve_git_dependencies_with_ref(solver, repo, package, ref ...@@ -949,7 +956,12 @@ def test_solver_can_resolve_git_dependencies_with_ref(solver, repo, package, ref
repo.add_package(pendulum) repo.add_package(pendulum)
repo.add_package(cleo) repo.add_package(cleo)
git_config = {"git": "https://github.com/demo/demo.git"} demo = get_package("demo", "0.1.2")
demo.source_type = "git"
demo.source_url = "https://github.com/demo/demo.git"
demo.source_reference = "9cf87a285a2d3fbb0b9fa621997b3acc3631ed24"
git_config = {demo.source_type: demo.source_url}
git_config.update(ref) git_config.update(ref)
package.add_dependency("demo", git_config) package.add_dependency("demo", git_config)
...@@ -957,10 +969,7 @@ def test_solver_can_resolve_git_dependencies_with_ref(solver, repo, package, ref ...@@ -957,10 +969,7 @@ def test_solver_can_resolve_git_dependencies_with_ref(solver, repo, package, ref
check_solver_result( check_solver_result(
ops, ops,
[ [{"job": "install", "package": pendulum}, {"job": "install", "package": demo}],
{"job": "install", "package": pendulum},
{"job": "install", "package": get_package("demo", "0.1.2")},
],
) )
op = ops[1] op = ops[1]
...@@ -1206,25 +1215,26 @@ def test_solver_git_dependencies_update(solver, repo, package, installed): ...@@ -1206,25 +1215,26 @@ def test_solver_git_dependencies_update(solver, repo, package, installed):
repo.add_package(pendulum) repo.add_package(pendulum)
repo.add_package(cleo) repo.add_package(cleo)
demo = get_package("demo", "0.1.2") demo_installed = get_package("demo", "0.1.2")
demo.source_type = "git" demo_installed.source_type = "git"
demo.source_url = "https://github.com/demo/demo.git" demo_installed.source_url = "https://github.com/demo/demo.git"
demo.source_reference = "123456" demo_installed.source_reference = "123456"
installed.add_package(demo) installed.add_package(demo_installed)
package.add_dependency("demo", {"git": "https://github.com/demo/demo.git"}) package.add_dependency("demo", {"git": "https://github.com/demo/demo.git"})
ops = solver.solve() ops = solver.solve()
demo = get_package("demo", "0.1.2")
demo.source_type = "git"
demo.source_url = "https://github.com/demo/demo.git"
demo.source_reference = "9cf87a285a2d3fbb0b9fa621997b3acc3631ed24"
check_solver_result( check_solver_result(
ops, ops,
[ [
{"job": "install", "package": pendulum}, {"job": "install", "package": pendulum},
{ {"job": "update", "from": demo_installed, "to": demo},
"job": "update",
"from": get_package("demo", "0.1.2"),
"to": get_package("demo", "0.1.2"),
},
], ],
) )
...@@ -1256,11 +1266,7 @@ def test_solver_git_dependencies_update_skipped(solver, repo, package, installed ...@@ -1256,11 +1266,7 @@ def test_solver_git_dependencies_update_skipped(solver, repo, package, installed
ops, ops,
[ [
{"job": "install", "package": pendulum}, {"job": "install", "package": pendulum},
{ {"job": "install", "package": demo, "skipped": True},
"job": "install",
"package": get_package("demo", "0.1.2"),
"skipped": True,
},
], ],
) )
...@@ -1289,11 +1295,7 @@ def test_solver_git_dependencies_short_hash_update_skipped( ...@@ -1289,11 +1295,7 @@ def test_solver_git_dependencies_short_hash_update_skipped(
ops, ops,
[ [
{"job": "install", "package": pendulum}, {"job": "install", "package": pendulum},
{ {"job": "install", "package": demo, "skipped": True},
"job": "install",
"package": get_package("demo", "0.1.2"),
"skipped": True,
},
], ],
) )
...@@ -1315,12 +1317,13 @@ def test_solver_can_resolve_directory_dependencies(solver, repo, package): ...@@ -1315,12 +1317,13 @@ def test_solver_can_resolve_directory_dependencies(solver, repo, package):
ops = solver.solve() ops = solver.solve()
demo = get_package("demo", "0.1.2")
demo.source_type = "directory"
demo.source_url = path
check_solver_result( check_solver_result(
ops, ops,
[ [{"job": "install", "package": pendulum}, {"job": "install", "package": demo}],
{"job": "install", "package": pendulum},
{"job": "install", "package": get_package("demo", "0.1.2")},
],
) )
op = ops[1] op = ops[1]
...@@ -1350,12 +1353,16 @@ def test_solver_can_resolve_directory_dependencies_with_extras(solver, repo, pac ...@@ -1350,12 +1353,16 @@ def test_solver_can_resolve_directory_dependencies_with_extras(solver, repo, pac
ops = solver.solve() ops = solver.solve()
demo = get_package("demo", "0.1.2")
demo.source_type = "directory"
demo.source_url = path
check_solver_result( check_solver_result(
ops, ops,
[ [
{"job": "install", "package": cleo}, {"job": "install", "package": cleo},
{"job": "install", "package": pendulum}, {"job": "install", "package": pendulum},
{"job": "install", "package": get_package("demo", "0.1.2")}, {"job": "install", "package": demo},
], ],
) )
...@@ -1382,12 +1389,13 @@ def test_solver_can_resolve_sdist_dependencies(solver, repo, package): ...@@ -1382,12 +1389,13 @@ def test_solver_can_resolve_sdist_dependencies(solver, repo, package):
ops = solver.solve() ops = solver.solve()
demo = get_package("demo", "0.1.0")
demo.source_type = "file"
demo.source_url = path
check_solver_result( check_solver_result(
ops, ops,
[ [{"job": "install", "package": pendulum}, {"job": "install", "package": demo}],
{"job": "install", "package": pendulum},
{"job": "install", "package": get_package("demo", "0.1.0")},
],
) )
op = ops[1] op = ops[1]
...@@ -1415,12 +1423,16 @@ def test_solver_can_resolve_sdist_dependencies_with_extras(solver, repo, package ...@@ -1415,12 +1423,16 @@ def test_solver_can_resolve_sdist_dependencies_with_extras(solver, repo, package
ops = solver.solve() ops = solver.solve()
demo = get_package("demo", "0.1.0")
demo.source_type = "file"
demo.source_url = path
check_solver_result( check_solver_result(
ops, ops,
[ [
{"job": "install", "package": cleo}, {"job": "install", "package": cleo},
{"job": "install", "package": pendulum}, {"job": "install", "package": pendulum},
{"job": "install", "package": get_package("demo", "0.1.0")}, {"job": "install", "package": demo},
], ],
) )
...@@ -1447,12 +1459,13 @@ def test_solver_can_resolve_wheel_dependencies(solver, repo, package): ...@@ -1447,12 +1459,13 @@ def test_solver_can_resolve_wheel_dependencies(solver, repo, package):
ops = solver.solve() ops = solver.solve()
demo = get_package("demo", "0.1.0")
demo.source_type = "file"
demo.source_url = path
check_solver_result( check_solver_result(
ops, ops,
[ [{"job": "install", "package": pendulum}, {"job": "install", "package": demo}],
{"job": "install", "package": pendulum},
{"job": "install", "package": get_package("demo", "0.1.0")},
],
) )
op = ops[1] op = ops[1]
...@@ -1480,12 +1493,16 @@ def test_solver_can_resolve_wheel_dependencies_with_extras(solver, repo, package ...@@ -1480,12 +1493,16 @@ def test_solver_can_resolve_wheel_dependencies_with_extras(solver, repo, package
ops = solver.solve() ops = solver.solve()
demo = get_package("demo", "0.1.0")
demo.source_type = "file"
demo.source_url = path
check_solver_result( check_solver_result(
ops, ops,
[ [
{"job": "install", "package": cleo}, {"job": "install", "package": cleo},
{"job": "install", "package": pendulum}, {"job": "install", "package": pendulum},
{"job": "install", "package": get_package("demo", "0.1.0")}, {"job": "install", "package": demo},
], ],
) )
......
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