[test] fix mariadb switch account test

In SwitchToNewAccount the resources get simulated to be ready
to allow the controller to proceed. At least seen in NovaConduction,
this has seen to can happen to be still on the generation before
the account switch.

This updates the test to wait for cell0 NovaConductor being updated
to the new generation before simulate the services to be ready.

Signed-off-by: Martin Schuppert <mschuppert@redhat.com>

Author: stuggi

test/functional/nova_controller_test.go

@@ -1577,8 +1577,17 @@ var _ = Describe("Nova controller", func() {
 
 		},
 		SwitchToNewAccount: func() {
-			SimulateReadyOfNovaTopServices()
+			// Wait for cell0 NovaConductor being updated to the new generation before
+			// simulate the services to be ready. Otherwise it can happen that the old
+			// version gets simulated to be ready and the new generation never reaches
+			// the ready state.
+			Eventually(func(g Gomega) {
+				conductor := GetNovaConductor(cell0.ConductorName)
+				g.Expect(conductor.Generation).To(BeNumerically(">", 1))
+				g.Expect(conductor.Generation).To(Equal(conductor.Status.ObservedGeneration))
+			}, timeout, interval).Should(Succeed())
 
+			SimulateReadyOfNovaTopServices()
 		},
 		// delete the CR, allowing tests that exercise finalizer removal
 		DeleteCR: func() {
@@ -1697,11 +1706,18 @@ var _ = Describe("Nova controller", func() {
 
 		},
 		SwitchToNewAccount: func() {
+			// Wait for cell0 NovaConductor being updated to the new generation before
+			// simulate the services to be ready. Otherwise it can happen that the old
+			// version gets simulated to be ready and the new generation never reaches
+			// the ready state.
+			Eventually(func(g Gomega) {
+				conductor := GetNovaConductor(cell0.ConductorName)
+				g.Expect(conductor.Generation).To(BeNumerically(">", 1))
+				g.Expect(conductor.Generation).To(Equal(conductor.Status.ObservedGeneration))
+			}, timeout, interval).Should(Succeed())
+
 			SimulateReadyOfNovaTopServices()
 			Eventually(func(g Gomega) {
-				th.SimulateJobSuccess(cell0.DBSyncJobName)
-				th.SimulateStatefulSetReplicaReady(cell0.ConductorStatefulSetName)
-				th.SimulateJobSuccess(cell0.CellMappingJobName)
 				nova := GetNova(novaNames.NovaName)
 				g.Expect(nova.Status.APIServiceReadyCount).To(Equal(int32(1)))
 				g.Expect(nova.Status.SchedulerServiceReadyCount).To(Equal(int32(1)))