From 3b0d16f99f8dd2fb19e6e97ec217d4f16c8082bb Mon Sep 17 00:00:00 2001 From: Rupam Manna <111190901+Rupam-It@users.noreply.github.com> Date: Tue, 3 Sep 2024 23:24:42 +0530 Subject: [PATCH] add defer function for mandatorily delete the nodelatencymonitor CR Signed-off-by: Rupam-It --- test/e2e/nodelatencymonitor_test.go | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/test/e2e/nodelatencymonitor_test.go b/test/e2e/nodelatencymonitor_test.go index 535261aa980..cec2f41abb5 100644 --- a/test/e2e/nodelatencymonitor_test.go +++ b/test/e2e/nodelatencymonitor_test.go @@ -43,6 +43,11 @@ func TestNodeLatencyMonitor(t *testing.T) { require.NoError(t, err, "Failed to create NodeLatencyMonitor CR") t.Logf("NodeLatencyMonitor CR created successfully.") + defer func() { + err = data.crdClient.CrdV1alpha1().NodeLatencyMonitors().Delete(context.TODO(), "default", metav1.DeleteOptions{}) + require.NoError(t, err, "Failed to delete NodeLatencyMonitor CR") + t.Logf("NodeLatencyMonitor CR deleted successfully.") + }() previousTimes := make(map[string]map[string]metav1.Time) validateNodeLatencyStats := func(statsList *v1alpha1.NodeLatencyStatsList, initialPoll bool) (bool, error) { @@ -93,12 +98,7 @@ func TestNodeLatencyMonitor(t *testing.T) { if err != nil { return false, err } - - valid, validateErr := validateNodeLatencyStats(statsList, true) - if !valid { - return false, validateErr - } - return true, nil + return validateNodeLatencyStats(statsList, true) }) require.NoError(t, err, "Failed to validate initial NodeLatencyStats") @@ -107,18 +107,10 @@ func TestNodeLatencyMonitor(t *testing.T) { if err != nil { return false, err } - - valid, validateErr := validateNodeLatencyStats(statsList, false) - if !valid { - return false, validateErr - } - return true, nil + return validateNodeLatencyStats(statsList, false) }) require.NoError(t, err, "Failed to validate updated NodeLatencyStats") t.Logf("Successfully received and validated NodeLatencyStats") - err = data.crdClient.CrdV1alpha1().NodeLatencyMonitors().Delete(context.TODO(), "default", metav1.DeleteOptions{}) - require.NoError(t, err, "Failed to delete NodeLatencyMonitor CR") - t.Logf("NodeLatencyMonitor CR deleted successfully.") }