Enable "impossible checks" tests for new solver

Although these tests are for exercising the "impossible checks" behavior
in the og solver, it is still good to prove the new solver results in
the same outcome.

Signed-off-by: J Robert Ray <[email protected]>

Author: jrray

crates/spk-solve/src/solver_test.rs

@@ -19,7 +19,7 @@ use spk_schema::ident::{
     RequestedBy,
     VarRequest,
 };
-use spk_schema::ident_build::{Build, BuildId, EmbeddedSource};
+use spk_schema::ident_build::{Build, BuildId};
 use spk_schema::prelude::*;
 use spk_schema::{recipe, v0};
 use spk_solve_macros::{make_build, make_build_and_components, make_package, make_repo, request};
@@ -202,8 +202,8 @@ async fn test_solver_package_with_no_recipe(
 }
 
 #[rstest]
-// This test is only applicable to the og solver
 #[case::og(og_solver())]
+#[case::cdcl(cdcl_solver())]
 #[tokio::test]
 async fn test_solver_package_with_no_recipe_and_impossible_initial_checks(
     #[case] mut solver: SolverImpl,
@@ -292,8 +292,8 @@ async fn test_solver_package_with_no_recipe_from_cmd_line(#[case] mut solver: So
 }
 
 #[rstest]
-// This test is only applicable to the og solver
 #[case::og(og_solver())]
+#[case::cdcl(cdcl_solver())]
 #[tokio::test]
 async fn test_solver_package_with_no_recipe_from_cmd_line_and_impossible_initial_checks(
     #[case] mut solver: SolverImpl,
@@ -1225,8 +1225,8 @@ async fn test_solver_build_from_source_deprecated(#[case] mut solver: SolverImpl
 }
 
 #[rstest]
-// This test is only applicable to the og solver
 #[case::og(og_solver())]
+#[case::cdcl(cdcl_solver())]
 #[tokio::test]
 async fn test_solver_build_from_source_deprecated_and_impossible_initial_checks(
     #[case] mut solver: SolverImpl,
@@ -1265,7 +1265,8 @@ async fn test_solver_build_from_source_deprecated_and_impossible_initial_checks(
 
     let res = run_and_print_resolve_for_tests(&mut solver).await;
     match res {
-        Err(Error::GraphError(spk_solve_graph::Error::FailedToResolve(_))) => {
+        Err(Error::GraphError(spk_solve_graph::Error::FailedToResolve(_)))
+        | Err(Error::FailedToResolve(_)) => {
             // Success, when the 'migration-to-components' feature is
             // enabled because: the initial checks for impossible
             // requests pass because the :all component matches the
@@ -1464,8 +1465,8 @@ async fn test_solver_embedded_package_replaces_real_package(#[case] mut solver:
 }
 
 #[rstest]
-// This test is only applicable to the og solver
 #[case::og(og_solver())]
+#[case::cdcl(cdcl_solver())]
 #[tokio::test]
 async fn test_solver_initial_request_impossible_masks_embedded_package_solution(
     #[case] mut solver: SolverImpl,
@@ -1508,7 +1509,7 @@ async fn test_solver_initial_request_impossible_masks_embedded_package_solution(
             assert_resolved!(
                 solution,
                 "qt",
-                build = Build::Embedded(EmbeddedSource::Unknown)
+                build =~ Build::Embedded(_)
             );
         }
         Err(err) => {
@@ -1518,8 +1519,8 @@ async fn test_solver_initial_request_impossible_masks_embedded_package_solution(
 }
 
 #[rstest]
-// This test is only applicable to the og solver
 #[case::og(og_solver())]
+#[case::cdcl(cdcl_solver())]
 #[tokio::test]
 async fn test_solver_impossible_request_but_embedded_package_makes_solvable(
     #[case] mut solver: SolverImpl,
@@ -1590,7 +1591,7 @@ async fn test_solver_impossible_request_but_embedded_package_makes_solvable(
             assert_resolved!(
                 solution,
                 "qt",
-                build = Build::Embedded(EmbeddedSource::Unknown)
+                build =~ Build::Embedded(_)
             );
         }
         Err(err) => {
@@ -1664,8 +1665,8 @@ async fn test_multiple_packages_embed_same_package(
 }
 
 #[rstest]
-// This test is only applicable to the og solver
 #[case::og(og_solver())]
+#[case::cdcl(cdcl_solver())]
 #[tokio::test]
 async fn test_solver_with_impossible_checks_in_build_keys(#[case] mut solver: SolverImpl) {
     let options1 = option_map! {"dep" => "1.0.0"};