Join errors for wrapping

elastic · Dec 6, 2023 · 5cb41f4 · 5cb41f4
1 parent c653272
commit 5cb41f4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/testing/upgradetest/upgrader.go b/testing/upgradetest/upgrader.go
@@ -434,7 +434,7 @@ func waitUpgradeDetailsState(ctx context.Context, f *atesting.Fixture, expectedS
 		select {
 		case <-ctx.Done():
 			if lastErr != nil {
-				return fmt.Errorf("failed waiting for status (%w): %s", ctx.Err(), lastErr.Error())
+				return fmt.Errorf("failed waiting for status: %w", errors.Join(ctx.Err(), lastErr)
 			}
 			return ctx.Err()
 		case <-t.C: