Merge pull request #390 from fmount/topotests

Improve topology tests

Author: openshift-merge-bot[bot]

tests/functional/dnsmasq_controller_test.go

@@ -603,7 +603,8 @@ var _ = Describe("DNSMasq controller", func() {
 				g.Expect(finalizers).To(ContainElement(
 					fmt.Sprintf("openstack.org/dnsmasq-%s", dnsMasqName.Name)))
 			}, timeout, interval).Should(Succeed())
-
+		})
+		It("checks the previous topology has no reference anymore", func() {
 			Eventually(func(g Gomega) {
 				// Verify the previous referenced topology has no finalizers
 				tp := GetTopology(types.NamespacedName{

tests/functional/memcached_controller_test.go

@@ -195,7 +195,16 @@ var _ = Describe("Memcached Controller", func() {
 				g.Expect(finalizers).To(ContainElement(
 					fmt.Sprintf("openstack.org/memcached-%s", memcachedName.Name)))
 			}, timeout, interval).Should(Succeed())
-
+		})
+		It("checks the memcached topology Condition", func() {
+			th.ExpectCondition(
+				memcachedName,
+				ConditionGetterFunc(MemcachedConditionGetter),
+				condition.TopologyReadyCondition,
+				corev1.ConditionTrue,
+			)
+		})
+		It("checks the previous topology has no reference anymore", func() {
 			Eventually(func(g Gomega) {
 				// Verify the previous referenced topology has no finalizers
 				tp := GetTopology(types.NamespacedName{