fix tests

Author: Patryk Wasielewski

pkg/splunk/enterprise/clustermanager_test.go

@@ -1479,6 +1479,7 @@ func TestIsClusterManagerReadyForUpgrade(t *testing.T) {
 				Spec: enterpriseApi.Spec{
 					ImagePullPolicy: "Always",
 					Image:           "splunk/splunk:latest",
+					TerminationGracePeriodSeconds: 20,
 				},
 				Volumes: []corev1.Volume{},
 				LicenseManagerRef: corev1.ObjectReference{

pkg/splunk/enterprise/configuration_test.go

@@ -21,9 +21,9 @@ import (
 	"fmt"
 	"math/rand"
 	"os"
+	"reflect"
 	"strings"
 	"testing"
-	"reflect"
 
 	enterpriseApi "github.com/splunk/splunk-operator/api/v4"
 	"github.com/stretchr/testify/require"
@@ -75,12 +75,8 @@ func marshalAndCompare(t *testing.T, compare interface{}, method string, want st
 	if err != nil {
 		t.Errorf("%s failed to marshall", err)
 	}
-	actual := strings.ReplaceAll(string(got), " ", "")
 	want = strings.ReplaceAll(want, " ", "")
 
-	if actual != want {
-		t.Errorf("Method %s, got = %s;\nwant %s", method, got, want)
-	}
 	require.JSONEq(t, string(got), want)
 }
 
@@ -1762,38 +1758,38 @@ func TestValidateLivenessProbe(t *testing.T) {
 }
 
 func TestSetPreStopLifecycleHandler(t *testing.T) {
-    // Create a pod template spec with a single container
-    podTemplateSpec := corev1.PodTemplateSpec{
-        Spec: corev1.PodSpec{
-            Containers: []corev1.Container{
-                {Name: "splunk"},
-            },
-        },
-    }
-
-    // Index of the container to apply the lifecycle handler
-    idx := 0
-
-    // Set the lifecycle handler
-    setPreStopLifecycleHandler(&podTemplateSpec, idx)
-
-    t.Run("test lifecycle pre-stop handler", func(t *testing.T) {
-        // Verify that the lifecycle handler was set correctly
-        if podTemplateSpec.Spec.Containers[idx].Lifecycle == nil {
-            t.Error("Expected Lifecycle to be set, but it was nil")
-        }
-
-        if podTemplateSpec.Spec.Containers[idx].Lifecycle.PreStop == nil {
-            t.Error("Expected PreStop to be set, but it was nil")
-        }
-
-        if podTemplateSpec.Spec.Containers[idx].Lifecycle.PreStop.Exec == nil {
-            t.Error("Expected Exec to be set, but it was nil")
-        }
-
-        expectedCommand := []string{"/bin/sh", "-c", "/opt/splunk/bin/splunk offline &&  /opt/splunk/bin/splunk stop"}
-        if !reflect.DeepEqual(podTemplateSpec.Spec.Containers[idx].Lifecycle.PreStop.Exec.Command, expectedCommand) {
-            t.Errorf("Expected command to be %v, but got %v", expectedCommand, podTemplateSpec.Spec.Containers[idx].Lifecycle.PreStop.Exec.Command)
-        }
-    })
+	// Create a pod template spec with a single container
+	podTemplateSpec := corev1.PodTemplateSpec{
+		Spec: corev1.PodSpec{
+			Containers: []corev1.Container{
+				{Name: "splunk"},
+			},
+		},
+	}
+
+	// Index of the container to apply the lifecycle handler
+	idx := 0
+
+	// Set the lifecycle handler
+	setPreStopLifecycleHandler(&podTemplateSpec, idx)
+
+	t.Run("test lifecycle pre-stop handler", func(t *testing.T) {
+		// Verify that the lifecycle handler was set correctly
+		if podTemplateSpec.Spec.Containers[idx].Lifecycle == nil {
+			t.Error("Expected Lifecycle to be set, but it was nil")
+		}
+
+		if podTemplateSpec.Spec.Containers[idx].Lifecycle.PreStop == nil {
+			t.Error("Expected PreStop to be set, but it was nil")
+		}
+
+		if podTemplateSpec.Spec.Containers[idx].Lifecycle.PreStop.Exec == nil {
+			t.Error("Expected Exec to be set, but it was nil")
+		}
+
+		expectedCommand := []string{"/bin/sh", "-c", "/opt/splunk/bin/splunk offline && /opt/splunk/bin/splunk stop"}
+		if !reflect.DeepEqual(podTemplateSpec.Spec.Containers[idx].Lifecycle.PreStop.Exec.Command, expectedCommand) {
+			t.Errorf("Expected command to be %v, but got %v", expectedCommand, podTemplateSpec.Spec.Containers[idx].Lifecycle.PreStop.Exec.Command)
+		}
+	})
 }