From 778497c9f816dc4a4a5f79e0ee7e07b96402bcb2 Mon Sep 17 00:00:00 2001 From: hbelmiro Date: Thu, 29 Aug 2024 11:18:43 -0300 Subject: [PATCH] chore: Improved logs for tests Signed-off-by: hbelmiro --- controllers/testutil/util.go | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/controllers/testutil/util.go b/controllers/testutil/util.go index d6a2c7f43..f5d1c962c 100644 --- a/controllers/testutil/util.go +++ b/controllers/testutil/util.go @@ -21,7 +21,9 @@ import ( "fmt" dspav1alpha1 "github.com/opendatahub-io/data-science-pipelines-operator/api/v1alpha1" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "os" + ctrl "sigs.k8s.io/controller-runtime" "testing" "time" @@ -121,22 +123,25 @@ func DeleteResource(uc UtilContext, path string, t *testing.T) { // See testutil.CompareResourceProcs for supported procedures. func CompareResources(uc UtilContext, path string, t *testing.T) { manifest, err := mf.NewManifest(path, uc.Opts) - assert.NoError(t, err) + require.NoError(t, err) manifest, err = manifest.Transform(mf.InjectNamespace(uc.Ns)) - assert.NoError(t, err) + require.NoError(t, err) expected := &manifest.Resources()[0] var actual *unstructured.Unstructured - assert.Eventually(t, func() bool { + require.Eventually(t, func() bool { var err error actual, err = manifest.Client.Get(expected) + if err != nil { + ctrl.Log.Info("Error when trying to get " + expected.GetName() + " (will keep trying until reaching timeout): " + err.Error()) + } return err == nil }, timeout, interval) rest := expected.Object["kind"].(string) result, err := CompareResourceProcs[rest](expected, actual) - assert.NoError(t, err) - assert.True(t, result) + require.NoError(t, err) + require.True(t, result) } // DirExists checks whether dir at path exists