Another embedded package test passing

This test was expecting a solver error but the new solver doesn't fail
with a GraphError.

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

Author: jrray

crates/spk-solve/src/cdcl_solver/mod.rs

@@ -94,7 +94,7 @@ impl AbstractSolver for Solver {
                             provider = Some(solver.provider().reset());
                             continue;
                         }
-                        return Err(Error::String(format!(
+                        return Err(Error::FailedToResolve(format!(
                             "{}",
                             conflict.display_user_friendly(&solver)
                         )));

crates/spk-solve/src/error.rs

@@ -65,6 +65,8 @@ pub enum Error {
     SolverLogFileIOError(#[source] std::io::Error, PathBuf),
     #[error("Error: Flushing solver log file: {0}")]
     SolverLogFileFlushError(#[source] std::io::Error),
+    #[error("Failed to resolve: {0}")]
+    FailedToResolve(String),
 }
 
 #[derive(Diagnostic, Debug, Error)]

crates/spk-solve/src/solver_test.rs

@@ -1601,8 +1601,6 @@ async fn test_solver_impossible_request_but_embedded_package_makes_solvable(
 /// panic.
 #[rstest]
 #[case::og(og_solver())]
-// Remove #[should_panic] once cdcl handles this case
-#[should_panic]
 #[case::cdcl(cdcl_solver())]
 #[tokio::test]
 async fn test_multiple_packages_embed_same_package(
@@ -1649,7 +1647,10 @@ async fn test_multiple_packages_embed_same_package(
     }
 
     match run_and_print_resolve_for_tests(&mut solver).await {
+        // og solver's error
         Err(Error::GraphError(spk_solve_graph::Error::FailedToResolve(_))) => {}
+        // cdcl solver's error
+        Err(Error::FailedToResolve(_)) => {}
         Ok(_) => {
             panic!("No solution expected");
         }