Rephrasing the error message in case of continuous failure

Signed-off-by: Rohit Aggarwal <rohit.aggarwal@broadcom.com>
carvel-dev · Sep 20, 2024 · 3e3d015 · 3e3d015
1 parent 2f318fc
commit 3e3d015
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/kapp/resourcesmisc/custom_waiting_resource.go b/pkg/kapp/resourcesmisc/custom_waiting_resource.go
@@ -99,8 +99,8 @@ func (s CustomWaitingResource) IsDoneApplying() DoneApplyState {
 					isTimeOutConditionPresent = true
 					if s.hasTimeoutOccurred(condMatcher.Timeout, s.resource.Description()) {
 						return DoneApplyState{Done: true, Successful: false, Message: fmt.Sprintf(
-							"Encountered failure condition %s == %s: %s (message: %s) continuously for %s duration",
-							cond.Type, condMatcher.Status, cond.Reason, cond.Message, condMatcher.Timeout)}
+							"Continiously failed for %s with %s == %s: %s (message: %s)",
+							condMatcher.Timeout, cond.Type, condMatcher.Status, cond.Reason, cond.Message)}
 					}
 					return DoneApplyState{Done: false, Message: fmt.Sprintf(
 						"%s: %s (message: %s)",

diff --git a/test/e2e/wait_timeout_test.go b/test/e2e/wait_timeout_test.go
@@ -103,7 +103,7 @@ waitRules:
 			RunOpts{IntoNs: true, AllowError: true, StdinReader: strings.NewReader(fmt.Sprintf(yaml2, "nginx:200"))})
 
 		require.Error(t, err)
-		require.Contains(t, err.Error(), "message: containers with unready status: [nginx]) continuously for 50s duration")
+		require.Contains(t, err.Error(), "Continiously failed for 50s with")
 	})
 
 	cleanUp()