test: update unit tests to verify batch events processing flag

Signed-off-by: Mykola Pelekh <[email protected]>

Author: mpelekh

pkg/cache/cluster_test.go

@@ -184,6 +184,12 @@ func TestEnsureSynced(t *testing.T) {
 }
 
 func TestStatefulSetOwnershipInferred(t *testing.T) {
+	var opts []UpdateSettingsFunc
+	opts = append(opts, func(c *clusterCache) {
+		c.batchEventsProcessing = true
+		c.eventProcessingInterval = 1 * time.Millisecond
+	})
+
 	sts := &appsv1.StatefulSet{
 		TypeMeta:   metav1.TypeMeta{APIVersion: "apps/v1", Kind: kube.StatefulSetKind},
 		ObjectMeta: metav1.ObjectMeta{UID: "123", Name: "web", Namespace: "default"},
@@ -196,63 +202,71 @@ func TestStatefulSetOwnershipInferred(t *testing.T) {
 		},
 	}
 
-	t.Run("STSTemplateNameNotMatching", func(t *testing.T) {
-		cluster := newCluster(t, sts)
-		err := cluster.EnsureSynced()
-		require.NoError(t, err)
-
-		pvc := mustToUnstructured(&v1.PersistentVolumeClaim{
-			TypeMeta:   metav1.TypeMeta{Kind: kube.PersistentVolumeClaimKind},
-			ObjectMeta: metav1.ObjectMeta{Name: "www1-web-0", Namespace: "default"},
-		})
-
-		cluster.recordEvent(watch.Added, pvc)
-
-		cluster.lock.Lock()
-		defer cluster.lock.Unlock()
-
-		refs := cluster.resources[kube.GetResourceKey(pvc)].OwnerRefs
-
-		assert.Len(t, refs, 0)
-	})
-
-	t.Run("STSTemplateNameNotMatching", func(t *testing.T) {
-		cluster := newCluster(t, sts)
-		err := cluster.EnsureSynced()
-		require.NoError(t, err)
-
-		pvc := mustToUnstructured(&v1.PersistentVolumeClaim{
-			TypeMeta:   metav1.TypeMeta{Kind: kube.PersistentVolumeClaimKind},
-			ObjectMeta: metav1.ObjectMeta{Name: "www1-web-0", Namespace: "default"},
-		})
-		cluster.recordEvent(watch.Added, pvc)
-
-		cluster.lock.Lock()
-		defer cluster.lock.Unlock()
+	tests := []struct {
+		name          string
+		cluster       *clusterCache
+		pvc           *v1.PersistentVolumeClaim
+		expectedRefs  []metav1.OwnerReference
+		expectNoOwner bool
+	}{
+		{
+			name:    "STSTemplateNameNotMatching",
+			cluster: newCluster(t, sts),
+			pvc: &v1.PersistentVolumeClaim{
+				TypeMeta:   metav1.TypeMeta{Kind: kube.PersistentVolumeClaimKind},
+				ObjectMeta: metav1.ObjectMeta{Name: "www1-web-0", Namespace: "default"},
+			},
+			expectNoOwner: true,
+		},
+		{
+			name:    "MatchingSTSExists",
+			cluster: newCluster(t, sts),
+			pvc: &v1.PersistentVolumeClaim{
+				TypeMeta:   metav1.TypeMeta{Kind: kube.PersistentVolumeClaimKind},
+				ObjectMeta: metav1.ObjectMeta{Name: "www-web-0", Namespace: "default"},
+			},
+			expectedRefs: []metav1.OwnerReference{{APIVersion: "apps/v1", Kind: kube.StatefulSetKind, Name: "web", UID: "123"}},
+		},
+		{
+			name:    "STSTemplateNameNotMatchingWithBatchProcessing",
+			cluster: newClusterWithOptions(t, opts, sts),
+			pvc: &v1.PersistentVolumeClaim{
+				TypeMeta:   metav1.TypeMeta{Kind: kube.PersistentVolumeClaimKind},
+				ObjectMeta: metav1.ObjectMeta{Name: "www1-web-0", Namespace: "default"},
+			},
+			expectNoOwner: true,
+		},
+		{
+			name:    "MatchingSTSExistsWithBatchProcessing",
+			cluster: newClusterWithOptions(t, opts, sts),
+			pvc: &v1.PersistentVolumeClaim{
+				TypeMeta:   metav1.TypeMeta{Kind: kube.PersistentVolumeClaimKind},
+				ObjectMeta: metav1.ObjectMeta{Name: "www-web-0", Namespace: "default"},
+			},
+			expectedRefs: []metav1.OwnerReference{{APIVersion: "apps/v1", Kind: kube.StatefulSetKind, Name: "web", UID: "123"}},
+		},
+	}
 
-		refs := cluster.resources[kube.GetResourceKey(pvc)].OwnerRefs
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			err := tc.cluster.EnsureSynced()
+			require.NoError(t, err)
 
-		assert.Len(t, refs, 0)
-	})
+			pvc := mustToUnstructured(tc.pvc)
+			tc.cluster.recordEvent(watch.Added, pvc)
 
-	t.Run("MatchingSTSExists", func(t *testing.T) {
-		cluster := newCluster(t, sts)
-		err := cluster.EnsureSynced()
-		require.NoError(t, err)
+			require.Eventually(t, func() bool {
+				tc.cluster.lock.Lock()
+				defer tc.cluster.lock.Unlock()
 
-		pvc := mustToUnstructured(&v1.PersistentVolumeClaim{
-			TypeMeta:   metav1.TypeMeta{Kind: kube.PersistentVolumeClaimKind},
-			ObjectMeta: metav1.ObjectMeta{Name: "www-web-0", Namespace: "default"},
+				refs := tc.cluster.resources[kube.GetResourceKey(pvc)].OwnerRefs
+				if tc.expectNoOwner {
+					return len(refs) == 0
+				}
+				return assert.ElementsMatch(t, refs, tc.expectedRefs)
+			}, 5*time.Second, 10*time.Millisecond, "Expected PVC to have correct owner reference")
 		})
-		cluster.recordEvent(watch.Added, pvc)
-
-		cluster.lock.Lock()
-		defer cluster.lock.Unlock()
-
-		refs := cluster.resources[kube.GetResourceKey(pvc)].OwnerRefs
-
-		assert.ElementsMatch(t, refs, []metav1.OwnerReference{{APIVersion: "apps/v1", Kind: kube.StatefulSetKind, Name: "web", UID: "123"}})
-	})
+	}
 }
 
 func TestEnsureSyncedSingleNamespace(t *testing.T) {