Skip to content

tests/solver: validate correct packages #2732

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
finswimmer merged 1 commit into from
Aug 15, 2020
Merged

tests/solver: validate correct packages #2732

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
107 changes: 62 additions & 45 deletions tests/puzzle/test_solver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -902,12 +902,14 @@ def test_solver_can_resolve_git_dependencies(solver, repo, package):

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(
ops,
[
{"job": "install", "package": pendulum},
{"job": "install", "package": get_package("demo", "0.1.2")},
],
[{"job": "install", "package": pendulum}, {"job": "install", "package": demo}],
)

op = ops[1]
Expand All @@ -928,12 +930,17 @@ def test_solver_can_resolve_git_dependencies_with_extras(solver, repo, package):

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(
ops,
[
{"job": "install", "package": cleo},
{"job": "install", "package": pendulum},
{"job": "install", "package": get_package("demo", "0.1.2")},
{"job": "install", "package": demo},
],
)

Expand All @@ -949,18 +956,20 @@ def test_solver_can_resolve_git_dependencies_with_ref(solver, repo, package, ref
repo.add_package(pendulum)
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)
package.add_dependency("demo", git_config)

ops = solver.solve()

check_solver_result(
ops,
[
{"job": "install", "package": pendulum},
{"job": "install", "package": get_package("demo", "0.1.2")},
],
[{"job": "install", "package": pendulum}, {"job": "install", "package": demo}],
)

op = ops[1]
Expand Down Expand Up @@ -1206,25 +1215,26 @@ def test_solver_git_dependencies_update(solver, repo, package, installed):
repo.add_package(pendulum)
repo.add_package(cleo)

demo = get_package("demo", "0.1.2")
demo.source_type = "git"
demo.source_url = "https://github.com/demo/demo.git"
demo.source_reference = "123456"
installed.add_package(demo)
demo_installed = get_package("demo", "0.1.2")
demo_installed.source_type = "git"
demo_installed.source_url = "https://github.com/demo/demo.git"
demo_installed.source_reference = "123456"
installed.add_package(demo_installed)

package.add_dependency("demo", {"git": "https://github.com/demo/demo.git"})

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(
ops,
[
{"job": "install", "package": pendulum},
{
"job": "update",
"from": get_package("demo", "0.1.2"),
"to": get_package("demo", "0.1.2"),
},
{"job": "update", "from": demo_installed, "to": demo},
],
)

Expand Down Expand Up @@ -1256,11 +1266,7 @@ def test_solver_git_dependencies_update_skipped(solver, repo, package, installed
ops,
[
{"job": "install", "package": pendulum},
{
"job": "install",
"package": get_package("demo", "0.1.2"),
"skipped": True,
},
{"job": "install", "package": demo, "skipped": True},
],
)

Expand Down Expand Up @@ -1289,11 +1295,7 @@ def test_solver_git_dependencies_short_hash_update_skipped(
ops,
[
{"job": "install", "package": pendulum},
{
"job": "install",
"package": get_package("demo", "0.1.2"),
"skipped": True,
},
{"job": "install", "package": demo, "skipped": True},
],
)

Expand All @@ -1315,12 +1317,13 @@ def test_solver_can_resolve_directory_dependencies(solver, repo, package):

ops = solver.solve()

demo = get_package("demo", "0.1.2")
demo.source_type = "directory"
demo.source_url = path

check_solver_result(
ops,
[
{"job": "install", "package": pendulum},
{"job": "install", "package": get_package("demo", "0.1.2")},
],
[{"job": "install", "package": pendulum}, {"job": "install", "package": demo}],
)

op = ops[1]
Expand Down Expand Up @@ -1350,12 +1353,16 @@ def test_solver_can_resolve_directory_dependencies_with_extras(solver, repo, pac

ops = solver.solve()

demo = get_package("demo", "0.1.2")
demo.source_type = "directory"
demo.source_url = path

check_solver_result(
ops,
[
{"job": "install", "package": cleo},
{"job": "install", "package": pendulum},
{"job": "install", "package": get_package("demo", "0.1.2")},
{"job": "install", "package": demo},
],
)

Expand All @@ -1382,12 +1389,13 @@ def test_solver_can_resolve_sdist_dependencies(solver, repo, package):

ops = solver.solve()

demo = get_package("demo", "0.1.0")
demo.source_type = "file"
demo.source_url = path

check_solver_result(
ops,
[
{"job": "install", "package": pendulum},
{"job": "install", "package": get_package("demo", "0.1.0")},
],
[{"job": "install", "package": pendulum}, {"job": "install", "package": demo}],
)

op = ops[1]
Expand Down Expand Up @@ -1415,12 +1423,16 @@ def test_solver_can_resolve_sdist_dependencies_with_extras(solver, repo, package

ops = solver.solve()

demo = get_package("demo", "0.1.0")
demo.source_type = "file"
demo.source_url = path

check_solver_result(
ops,
[
{"job": "install", "package": cleo},
{"job": "install", "package": pendulum},
{"job": "install", "package": get_package("demo", "0.1.0")},
{"job": "install", "package": demo},
],
)

Expand All @@ -1447,12 +1459,13 @@ def test_solver_can_resolve_wheel_dependencies(solver, repo, package):

ops = solver.solve()

demo = get_package("demo", "0.1.0")
demo.source_type = "file"
demo.source_url = path

check_solver_result(
ops,
[
{"job": "install", "package": pendulum},
{"job": "install", "package": get_package("demo", "0.1.0")},
],
[{"job": "install", "package": pendulum}, {"job": "install", "package": demo}],
)

op = ops[1]
Expand Down Expand Up @@ -1480,12 +1493,16 @@ def test_solver_can_resolve_wheel_dependencies_with_extras(solver, repo, package

ops = solver.solve()

demo = get_package("demo", "0.1.0")
demo.source_type = "file"
demo.source_url = path

check_solver_result(
ops,
[
{"job": "install", "package": cleo},
{"job": "install", "package": pendulum},
{"job": "install", "package": get_package("demo", "0.1.0")},
{"job": "install", "package": demo},
],
)

Expand Down