Skip to content

Commit a29c6c7

Browse files
committed
Expand test coverage for resolvo solver
To promote better test coverage, the build_package family of macros now require the name of the solver to use, and all the tests using these macros now run the test against all three solver choices (ignoring "all"). Workaround too many arguments lint and rstest la10736/rstest#226 (comment) Bumped to the latest version of rstest first to see if that would help. Signed-off-by: J Robert Ray <[email protected]>
1 parent e236ea8 commit a29c6c7

File tree

9 files changed

+454
-219
lines changed

9 files changed

+454
-219
lines changed

Cargo.lock

Lines changed: 112 additions & 102 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ relative-path = "1.3"
8888
# https://github.com/prefix-dev/resolvo/pull/108
8989
resolvo = { git = "https://github.com/jrray/resolvo", branch = "format-with-panic" }
9090
ring = "0.17.14"
91-
rstest = "0.18.2"
91+
rstest = "0.25.0"
9292
sentry = { version = "0.34.0", default-features = false, features = [
9393
# all the default features except `debug-images` which causes a deadlock on
9494
# centos 7: https://github.com/getsentry/sentry-rust/issues/358

crates/spk-cli/cmd-build/src/cmd_build_test/environment.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ async fn basic_environment_generation(
2525
tmpdir: tempfile::TempDir,
2626
#[case] env_spec: &str,
2727
#[case] expected: &str,
28+
#[values("cli", "checks", "resolvo")] solver_to_run: &str,
2829
) {
2930
let rt = spfs_runtime().await;
3031

@@ -43,6 +44,7 @@ install:
4344
{env_spec}
4445
"#
4546
),
47+
solver_to_run
4648
);
4749

4850
let mut result = result.expect("Expected build to succeed");

0 commit comments

Comments
 (0)