From a6e5466942df67dccea00fbaa7b2ed4e5a8e619d Mon Sep 17 00:00:00 2001
From: Austin Abro <AustinAbro321@gmail.com>
Date: Sun, 29 Dec 2024 16:54:33 +0000
Subject: [PATCH] refactor test

Signed-off-by: Austin Abro <AustinAbro321@gmail.com>
---
 pkg/kube/kwait.go      |  8 +++++---
 pkg/kube/kwait_test.go | 23 ++++++++++-------------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/pkg/kube/kwait.go b/pkg/kube/kwait.go
index 6c1d5b748..639794322 100644
--- a/pkg/kube/kwait.go
+++ b/pkg/kube/kwait.go
@@ -18,6 +18,7 @@ package kube // import "helm.sh/helm/v3/pkg/kube"
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"time"
 
@@ -82,15 +83,16 @@ func (w *kstatusWaiter) Wait(resourceList ResourceList, timeout time.Duration) e
 
 	// Only check parent context error, otherwise we would error when desired status is achieved.
 	if ctx.Err() != nil {
-		var err error
+		errs := []error{}
 		for _, id := range resources {
 			rs := statusCollector.ResourceStatuses[id]
 			if rs.Status == status.CurrentStatus {
 				continue
 			}
-			err = fmt.Errorf("%s: %s not ready, status: %s", rs.Identifier.Name, rs.Identifier.GroupKind.Kind, rs.Status)
+			errs = append(errs, fmt.Errorf("%s: %s not ready, status: %s", rs.Identifier.Name, rs.Identifier.GroupKind.Kind, rs.Status)) 
 		}
-		return fmt.Errorf("not all resources ready: %w: %w", ctx.Err(), err)
+		errs = append(errs, ctx.Err())
+		return errors.Join(errs...)
 	}
 	return nil
 }
diff --git a/pkg/kube/kwait_test.go b/pkg/kube/kwait_test.go
index 372735462..fd5cd0b57 100644
--- a/pkg/kube/kwait_test.go
+++ b/pkg/kube/kwait_test.go
@@ -21,6 +21,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/meta"
@@ -101,7 +102,7 @@ func TestKWaitJob(t *testing.T) {
 		{
 			name:       "Job is not complete",
 			objYamls:   []string{jobNoStatus},
-			expectErrs: []error{errors.New("not all resources ready: context deadline exceeded: test: Job not ready, status: InProgress")},
+			expectErrs: []error{errors.New("test: Job not ready, status: InProgress"), errors.New("context deadline exceeded")},
 		},
 		{
 			name:       "Pod is ready",
@@ -109,10 +110,9 @@ func TestKWaitJob(t *testing.T) {
 			expectErrs: nil,
 		},
 		{
-			name:     "one of the pods never becomes ready",
-			objYamls: []string{podNoStatus, podCurrent},
-			// TODO, make this better
-			expectErrs: []error{errors.New("not all resources ready: context deadline exceeded: in-progress-pod: Pod not ready, status: InProgress")},
+			name:       "one of the pods never becomes ready",
+			objYamls:   []string{podNoStatus, podCurrent},
+			expectErrs: []error{errors.New("in-progress-pod: Pod not ready, status: InProgress"), errors.New("context deadline exceeded")},
 		},
 	}
 
@@ -134,12 +134,12 @@ func TestKWaitJob(t *testing.T) {
 			for _, podYaml := range tt.objYamls {
 				m := make(map[string]interface{})
 				err := yaml.Unmarshal([]byte(podYaml), &m)
-				require.NoError(t, err)
+				assert.NoError(t, err)
 				resource := &unstructured.Unstructured{Object: m}
 				objs = append(objs, resource)
 				gvr := getGVR(t, fakeMapper, resource)
 				err = fakeClient.Tracker().Create(gvr, resource, resource.GetNamespace())
-				require.NoError(t, err)
+				assert.NoError(t, err)
 			}
 			c.Waiter = &kstatusWaiter{
 				sw:  statusWatcher,
@@ -149,19 +149,16 @@ func TestKWaitJob(t *testing.T) {
 			resourceList := ResourceList{}
 			for _, obj := range objs {
 				list, err := c.Build(objBody(obj), false)
-				if err != nil {
-					t.Fatal(err)
-				}
+				assert.NoError(t, err)
 				resourceList = append(resourceList, list...)
 			}
 
 			err := c.Wait(resourceList, time.Second*3)
 			if tt.expectErrs != nil {
-        //TODO remove require
-				require.EqualError(t, err, errors.Join(tt.expectErrs...).Error())
+				assert.EqualError(t, err, errors.Join(tt.expectErrs...).Error())
 				return
 			}
-			require.NoError(t, err)
+			assert.NoError(t, err)
 		})
 	}
 }