Fix broken test cases for multiple logs per Pod

FoundationDB · Jul 4, 2023 · 89b4660 · 89b4660
1 parent c7627f4
commit 89b4660
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/controllers/bounce_processes_test.go b/controllers/bounce_processes_test.go
@@ -295,13 +295,13 @@ var _ = Describe("bounceProcesses", func() {
 			_, err = reloadCluster(cluster)
 			Expect(err).NotTo(HaveOccurred())
 
-			processGroup := cluster.Status.ProcessGroups[len(cluster.Status.ProcessGroups)-4]
-			Expect(processGroup.ProcessGroupID).To(Equal(fdbv1beta2.ProcessGroupID("log-5")))
-			processGroup.UpdateCondition(fdbv1beta2.IncorrectCommandLine, true)
+			for idx, processGroup := range cluster.Status.ProcessGroups {
+				if processGroup.ProcessGroupID != "log-5" && processGroup.ProcessGroupID != "log-6" {
+					continue
+				}
 
-			processGroup = cluster.Status.ProcessGroups[len(cluster.Status.ProcessGroups)-3]
-			Expect(processGroup.ProcessGroupID).To(Equal(fdbv1beta2.ProcessGroupID("log-6")))
-			processGroup.UpdateCondition(fdbv1beta2.IncorrectCommandLine, true)
+				cluster.Status.ProcessGroups[idx].UpdateCondition(fdbv1beta2.IncorrectCommandLine, true)
+			}
 		})
 
 		It("should not requeue", func() {
@@ -337,7 +337,9 @@ var _ = Describe("bounceProcesses", func() {
 				for _, processGroup := range cluster.Status.ProcessGroups {
 					for _, address := range processGroup.Addresses {
 						addresses[fmt.Sprintf("%s:4501", address)] = fdbv1beta2.None{}
-						addresses[fmt.Sprintf("%s:4503", address)] = fdbv1beta2.None{}
+						if processGroup.ProcessClass == fdbv1beta2.ProcessClassLog {
+							addresses[fmt.Sprintf("%s:4503", address)] = fdbv1beta2.None{}
+						}
 					}
 				}
 				Expect(adminClient.KilledAddresses).To(Equal(addresses))