Fix tests

internal/runbits/requirements/rationalize.go

@@ -41,7 +41,7 @@ func (r *RequirementOperation) rationalizeError(err *error) {
 	// No matches, but have alternate suggestions
 	case errors.As(*err, &noMatchesErr) && noMatchesErr.Alternatives != nil:
 		*err = errs.WrapUserFacing(*err,
-			locale.Tr("package_ingredient_alternatives", tooManyMatchesErr.Query, *noMatchesErr.Alternatives),
+			locale.Tr("package_ingredient_alternatives", noMatchesErr.Query, *noMatchesErr.Alternatives),
 			errs.SetInput())
 
 	// We communicate buildplanner errors verbatim as the intend is that these are curated by the buildplanner

test/integration/activate_int_test.go

@@ -198,7 +198,7 @@ func (suite *ActivateIntegrationTestSuite) TestActivatePythonByHostOnly() {
 		cp.ExpectNotExitCode(0)
 
 		if strings.Count(cp.Snapshot(), " x ") != 1 {
-			suite.Fail("Expected exactly ONE error message, got: %s", cp.Snapshot())
+			suite.Fail("Expected exactly ONE error message, got: ", cp.Snapshot())
 		}
 	}
 }

test/integration/checkout_int_test.go

@@ -97,7 +97,7 @@ func (suite *CheckoutIntegrationTestSuite) TestCheckoutNonEmptyDir() {
 	cp.ExpectExitCode(1)
 
 	if strings.Count(cp.Snapshot(), " x ") != 1 {
-		suite.Fail("Expected exactly ONE error message, got: %s", cp.Snapshot())
+		suite.Fail("Expected exactly ONE error message, got: ", cp.Snapshot())
 	}
 
 	// remove file
@@ -217,7 +217,7 @@ func (suite *CheckoutIntegrationTestSuite) TestCheckoutNotFound() {
 	cp.ExpectExitCode(1)
 
 	if strings.Count(cp.Snapshot(), " x ") != 1 {
-		suite.Fail("Expected exactly ONE error message, got: %s", cp.Snapshot())
+		suite.Fail("Expected exactly ONE error message, got: ", cp.Snapshot())
 	}
 }
 

test/integration/install_int_test.go

@@ -36,7 +36,7 @@ func (suite *InstallIntegrationTestSuite) TestInstall_InvalidCommit() {
 	cp.ExpectExitCode(1)
 
 	if strings.Count(cp.Snapshot(), " x ") != 1 {
-		suite.Fail("Expected exactly ONE error message, got: %s", cp.Snapshot())
+		suite.Fail("Expected exactly ONE error message, got: ", cp.Snapshot())
 	}
 }
 
@@ -51,8 +51,8 @@ func (suite *InstallIntegrationTestSuite) TestInstall_NoMatches_NoAlternatives()
 	cp.Expect("find alternatives") // This verifies no alternatives were found
 	cp.ExpectExitCode(1)
 
-	if strings.Count(cp.Snapshot(), " x ") != 1 {
-		suite.Fail("Expected exactly ONE error message, got: %s", cp.Snapshot())
+	if strings.Count(strings.ReplaceAll(cp.Snapshot(), " x Failed", ""), " x ") != 1 {
+		suite.Fail("Expected exactly ONE error message, got: ", cp.Snapshot())
 	}
 }
 
@@ -67,8 +67,8 @@ func (suite *InstallIntegrationTestSuite) TestInstall_NoMatches_Alternatives() {
 	cp.Expect("did you mean") // This verifies alternatives were found
 	cp.ExpectExitCode(1)
 
-	if strings.Count(cp.Snapshot(), " x ") != 1 {
-		suite.Fail("Expected exactly ONE error message, got: %s", cp.Snapshot())
+	if strings.Count(strings.ReplaceAll(cp.Snapshot(), " x Failed", ""), " x ") != 1 {
+		suite.Fail("Expected exactly ONE error message, got: ", cp.Snapshot())
 	}
 }
 
@@ -82,8 +82,8 @@ func (suite *InstallIntegrationTestSuite) TestInstall_BuildPlannerError() {
 	cp.Expect("Could not plan build, platform responded with", e2e.RuntimeSourcingTimeoutOpt)
 	cp.ExpectExitCode(1)
 
-	if strings.Count(cp.Snapshot(), " x ") != 1 {
-		suite.Fail("Expected exactly ONE error message, got: %s", cp.Snapshot())
+	if strings.Count(strings.ReplaceAll(cp.Snapshot(), " x Failed", ""), " x ") != 1 {
+		suite.Fail("Expected exactly ONE error message, got: ", cp.Snapshot())
 	}
 }
 

test/integration/push_int_test.go

@@ -276,7 +276,7 @@ func (suite *PushIntegrationTestSuite) TestPush_NoProject() {
 	cp.ExpectExitCode(1)
 
 	if strings.Count(cp.Snapshot(), " x ") != 1 {
-		suite.Fail("Expected exactly ONE error message, got: %s", cp.Snapshot())
+		suite.Fail("Expected exactly ONE error message, got: ", cp.Snapshot())
 	}
 }
 
@@ -293,7 +293,7 @@ func (suite *PushIntegrationTestSuite) TestPush_NoAuth() {
 	cp.ExpectExitCode(1)
 
 	if strings.Count(cp.Snapshot(), " x ") != 1 {
-		suite.Fail("Expected exactly ONE error message, got: %s", cp.Snapshot())
+		suite.Fail("Expected exactly ONE error message, got: ", cp.Snapshot())
 	}
 }
 
@@ -312,7 +312,7 @@ func (suite *PushIntegrationTestSuite) TestPush_NoChanges() {
 	cp.ExpectExitCode(1)
 
 	if strings.Count(cp.Snapshot(), " x ") != 1 {
-		suite.Fail("Expected exactly ONE error message, got: %s", cp.Snapshot())
+		suite.Fail("Expected exactly ONE error message, got: ", cp.Snapshot())
 	}
 }
 
@@ -330,7 +330,7 @@ func (suite *PushIntegrationTestSuite) TestPush_NoCommit() {
 	cp.ExpectExitCode(1)
 
 	if strings.Count(cp.Snapshot(), " x ") != 1 {
-		suite.Fail("Expected exactly ONE error message, got: %s", cp.Snapshot())
+		suite.Fail("Expected exactly ONE error message, got: ", cp.Snapshot())
 	}
 }
 
@@ -350,7 +350,7 @@ func (suite *PushIntegrationTestSuite) TestPush_NameInUse() {
 	cp.ExpectExitCode(1)
 
 	if strings.Count(cp.Snapshot(), " x ") != 1 {
-		suite.Fail("Expected exactly ONE error message, got: %s", cp.Snapshot())
+		suite.Fail("Expected exactly ONE error message, got: ", cp.Snapshot())
 	}
 }
 
@@ -375,7 +375,7 @@ func (suite *PushIntegrationTestSuite) TestPush_Aborted() {
 	cp.ExpectExitCode(1)
 
 	if strings.Count(cp.Snapshot(), " x ") != 1 {
-		suite.Fail("Expected exactly ONE error message, got: %s", cp.Snapshot())
+		suite.Fail("Expected exactly ONE error message, got: ", cp.Snapshot())
 	}
 }
 
@@ -395,7 +395,7 @@ func (suite *PushIntegrationTestSuite) TestPush_InvalidHistory() {
 	cp.ExpectExitCode(1)
 
 	if strings.Count(cp.Snapshot(), " x ") != 1 {
-		suite.Fail("Expected exactly ONE error message, got: %s", cp.Snapshot())
+		suite.Fail("Expected exactly ONE error message, got: ", cp.Snapshot())
 	}
 }
 
@@ -414,7 +414,7 @@ func (suite *PushIntegrationTestSuite) TestPush_PullNeeded() {
 	cp.ExpectExitCode(1)
 
 	if strings.Count(cp.Snapshot(), " x ") != 1 {
-		suite.Fail("Expected exactly ONE error message, got: %s", cp.Snapshot())
+		suite.Fail("Expected exactly ONE error message, got: ", cp.Snapshot())
 	}
 }