update test

databricks · Jul 3, 2024 · f43774e · f43774e
1 parent 72f7399
commit f43774e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/integration/e2e_test.go b/integration/e2e_test.go
@@ -4,6 +4,7 @@ package integration
 
 import (
 	"context"
+	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -25,9 +26,9 @@ func TestRolloutHappyCase(t *testing.T) {
 	requireEventuallyPod(t, api, ctx, rolloutOperatorPod, expectPodPhase(corev1.PodRunning), expectReady())
 
 	// Create mock service, and check that it is in the desired state.
-	createMockServiceZone(t, ctx, api, corev1.NamespaceDefault, "mock-zone-a")
-	createMockServiceZone(t, ctx, api, corev1.NamespaceDefault, "mock-zone-b")
-	createMockServiceZone(t, ctx, api, corev1.NamespaceDefault, "mock-zone-c")
+	sts_a := createMockServiceZone(t, ctx, api, corev1.NamespaceDefault, "mock-zone-a")
+	sts_b := createMockServiceZone(t, ctx, api, corev1.NamespaceDefault, "mock-zone-b")
+	sts_c := createMockServiceZone(t, ctx, api, corev1.NamespaceDefault, "mock-zone-c")
 	requireEventuallyPod(t, api, ctx, "mock-zone-a-0", expectPodPhase(corev1.PodRunning), expectReady(), expectVersion("1"))
 	requireEventuallyPod(t, api, ctx, "mock-zone-b-0", expectPodPhase(corev1.PodRunning), expectReady(), expectVersion("1"))
 	requireEventuallyPod(t, api, ctx, "mock-zone-c-0", expectPodPhase(corev1.PodRunning), expectReady(), expectVersion("1"))
@@ -45,6 +46,10 @@ func TestRolloutHappyCase(t *testing.T) {
 	requireEventuallyPod(t, api, ctx, "mock-zone-b-0", expectReady(), expectVersion("1"))
 	requireEventuallyPod(t, api, ctx, "mock-zone-c-0", expectReady(), expectVersion("1"))
 
+	fmt.Println(sts_a.Status.Replicas, sts_a.Status.ReadyReplicas)
+	fmt.Println(sts_b.Status.Replicas, sts_b.Status.ReadyReplicas)
+	fmt.Println(sts_c.Status.Replicas, sts_c.Status.ReadyReplicas)
+
 	// zone-a becomes ready, zone-b should become not ready and be version 2.
 	makeMockReady(t, cluster, "mock-zone-a")
 	requireEventuallyPod(t, api, ctx, "mock-zone-a-0", expectReady(), expectVersion("2"))

diff --git a/integration/manifests_mock_service_test.go b/integration/manifests_mock_service_test.go
@@ -16,12 +16,10 @@ import (
 	"k8s.io/client-go/kubernetes"
 )
 
-func createMockServiceZone(t *testing.T, ctx context.Context, api *kubernetes.Clientset, namespace, name string) {
+func createMockServiceZone(t *testing.T, ctx context.Context, api *kubernetes.Clientset, namespace, name string) *appsv1.StatefulSet {
 	t.Helper()
-	{
-		_, err := api.AppsV1().StatefulSets(namespace).Create(ctx, mockServiceStatefulSet(name, "1", true), metav1.CreateOptions{})
-		require.NoError(t, err, "Can't create StatefulSet")
-	}
+	sts, err := api.AppsV1().StatefulSets(namespace).Create(ctx, mockServiceStatefulSet(name, "1", true), metav1.CreateOptions{})
+	require.NoError(t, err, "Can't create StatefulSet")
 
 	{
 		_, err := api.CoreV1().Services(namespace).Create(ctx, mockServiceService(name), metav1.CreateOptions{})
@@ -31,6 +29,7 @@ func createMockServiceZone(t *testing.T, ctx context.Context, api *kubernetes.Cl
 		_, err := api.NetworkingV1().Ingresses(namespace).Create(ctx, mockServiceIngress(name), metav1.CreateOptions{})
 		require.NoError(t, err, "Can't create Ingress")
 	}
+	return sts
 }
 
 func mockServiceService(name string) *corev1.Service {