Skip to content

Commit e669472

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #378 from zzzeek/fix_test_harness_for_finalizer
fix harness to not look for secret finalizers
2 parents bb676bb + e128a9d commit e669472

File tree

1 file changed

+0
-68
lines changed

1 file changed

+0
-68
lines changed

‎api/test/helpers/harnesses.go‎

Lines changed: 0 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,6 @@ func (harness *MariaDBTestHarness) RunBasicSuite() {
127127
return mariadbAccount.Finalizers
128128
}, timeout, interval).Should(ContainElement(harness.finalizerName))
129129

130-
// as well as in the secret
131-
Eventually(func() []string {
132-
dbSecret := harness.mariaDBHelper.GetSecret(types.NamespacedName{Name: mariadbAccount.Spec.Secret, Namespace: mariadbAccount.Namespace})
133-
return dbSecret.Finalizers
134-
}, timeout, interval).Should(ContainElement(harness.finalizerName))
135-
136130
// mariaDBDatabaseName is set
137131
Expect(mariadbAccount.Labels["mariaDBDatabaseName"]).Should(Equal(harness.databaseName))
138132

@@ -169,12 +163,6 @@ func (harness *MariaDBTestHarness) RunBasicSuite() {
169163
return mariadbAccount.Finalizers
170164
}, timeout, interval).Should(ContainElement(harness.finalizerName))
171165

172-
// as well as in the secret
173-
Eventually(func() []string {
174-
dbSecret := harness.mariaDBHelper.GetSecret(types.NamespacedName{Name: mariadbAccount.Spec.Secret, Namespace: mariadbAccount.Namespace})
175-
return dbSecret.Finalizers
176-
}, timeout, interval).Should(ContainElement(harness.finalizerName))
177-
178166
// mariaDBDatabaseName is set
179167
Expect(mariadbAccount.Labels["mariaDBDatabaseName"]).Should(Equal(harness.databaseName))
180168

@@ -209,13 +197,6 @@ func (harness *MariaDBTestHarness) RunBasicSuite() {
209197
return oldMariadbAccount.Finalizers
210198
}, timeout, interval).Should(ContainElement(harness.finalizerName))
211199

212-
// as well as in the secret
213-
Eventually(func() []string {
214-
oldMariadbAccount := mariaDBHelper.GetMariaDBAccount(oldAccountName)
215-
dbSecret := harness.mariaDBHelper.GetSecret(types.NamespacedName{Name: oldMariadbAccount.Spec.Secret, Namespace: oldMariadbAccount.Namespace})
216-
return dbSecret.Finalizers
217-
}, timeout, interval).Should(ContainElement(harness.finalizerName))
218-
219200
})
220201
It("should ensure a new MariaDBAccount exists when accountname is changed", func() {
221202
mariaDBHelper, timeout, interval := harness.mariaDBHelper, harness.timeout, harness.interval
@@ -250,27 +231,13 @@ func (harness *MariaDBTestHarness) RunBasicSuite() {
250231
return newMariadbAccount.Finalizers
251232
}, timeout, interval).Should(ContainElement(harness.finalizerName))
252233

253-
// as well as in the secret
254-
Eventually(func() []string {
255-
newMariadbAccount := mariaDBHelper.GetMariaDBAccount(newAccountName)
256-
dbSecret := harness.mariaDBHelper.GetSecret(types.NamespacedName{Name: newMariadbAccount.Spec.Secret, Namespace: newMariadbAccount.Namespace})
257-
return dbSecret.Finalizers
258-
}, timeout, interval).Should(ContainElement(harness.finalizerName))
259-
260234
// old account retains the finalizer because we did not yet
261235
// complete the new MariaDBAccount
262236
Consistently(func() []string {
263237
oldMariadbAccount := mariaDBHelper.GetMariaDBAccount(oldAccountName)
264238
return oldMariadbAccount.Finalizers
265239
}, timeout, interval).Should(ContainElement(harness.finalizerName))
266240

267-
// as well as in the secret
268-
Eventually(func() []string {
269-
oldMariadbAccount := mariaDBHelper.GetMariaDBAccount(oldAccountName)
270-
dbSecret := harness.mariaDBHelper.GetSecret(types.NamespacedName{Name: oldMariadbAccount.Spec.Secret, Namespace: oldMariadbAccount.Namespace})
271-
return dbSecret.Finalizers
272-
}, timeout, interval).Should(ContainElement(harness.finalizerName))
273-
274241
})
275242

276243
It("should move the finalizer to a new MariaDBAccount when create is complete", func() {
@@ -303,26 +270,12 @@ func (harness *MariaDBTestHarness) RunBasicSuite() {
303270
return newMariadbAccount.Finalizers
304271
}, timeout, interval).Should(ContainElement(harness.finalizerName))
305272

306-
// as well as in the secret
307-
Eventually(func() []string {
308-
newMariadbAccount := mariaDBHelper.GetMariaDBAccount(newAccountName)
309-
dbSecret := harness.mariaDBHelper.GetSecret(types.NamespacedName{Name: newMariadbAccount.Spec.Secret, Namespace: newMariadbAccount.Namespace})
310-
return dbSecret.Finalizers
311-
}, timeout, interval).Should(ContainElement(harness.finalizerName))
312-
313273
// finalizer removed from old account
314274
Eventually(func() []string {
315275
oldMariadbAccount := mariaDBHelper.GetMariaDBAccount(oldAccountName)
316276
return oldMariadbAccount.Finalizers
317277
}, timeout, interval).ShouldNot(ContainElement(harness.finalizerName))
318278

319-
// as well as in the secret
320-
Eventually(func() []string {
321-
oldMariadbAccount := mariaDBHelper.GetMariaDBAccount(oldAccountName)
322-
dbSecret := harness.mariaDBHelper.GetSecret(types.NamespacedName{Name: oldMariadbAccount.Spec.Secret, Namespace: oldMariadbAccount.Namespace})
323-
return dbSecret.Finalizers
324-
}, timeout, interval).ShouldNot(ContainElement(harness.finalizerName))
325-
326279
// CreateOrPatchDBByName will add a label referring to the database
327280
Eventually(func() string {
328281
mariadbAccount := mariaDBHelper.GetMariaDBAccount(newAccountName)
@@ -365,25 +318,11 @@ func (harness *MariaDBTestHarness) RunBasicSuite() {
365318
return newMariadbAccount.Finalizers
366319
}, timeout, interval).Should(ContainElement(harness.finalizerName))
367320

368-
// as well as in the secret
369-
Eventually(func() []string {
370-
newMariadbAccount := mariaDBHelper.GetMariaDBAccount(newAccountName)
371-
dbSecret := harness.mariaDBHelper.GetSecret(types.NamespacedName{Name: newMariadbAccount.Spec.Secret, Namespace: newMariadbAccount.Namespace})
372-
return dbSecret.Finalizers
373-
}, timeout, interval).Should(ContainElement(harness.finalizerName))
374-
375321
Eventually(func() []string {
376322
oldMariadbAccount := mariaDBHelper.GetMariaDBAccount(oldAccountName)
377323
return oldMariadbAccount.Finalizers
378324
}, timeout, interval).Should(ContainElement(harness.finalizerName))
379325

380-
// as well as in the secret
381-
Eventually(func() []string {
382-
oldMariadbAccount := mariaDBHelper.GetMariaDBAccount(oldAccountName)
383-
dbSecret := harness.mariaDBHelper.GetSecret(types.NamespacedName{Name: oldMariadbAccount.Spec.Secret, Namespace: oldMariadbAccount.Namespace})
384-
return dbSecret.Finalizers
385-
}, timeout, interval).Should(ContainElement(harness.finalizerName))
386-
387326
// now delete the CR
388327
harness.DeleteCR()
389328

@@ -399,13 +338,6 @@ func (harness *MariaDBTestHarness) RunBasicSuite() {
399338
return oldMariadbAccount.Finalizers
400339
}, timeout, interval).ShouldNot(ContainElement(harness.finalizerName))
401340

402-
// as well as in the secret
403-
Eventually(func() []string {
404-
oldMariadbAccount := mariaDBHelper.GetMariaDBAccount(oldAccountName)
405-
dbSecret := harness.mariaDBHelper.GetSecret(types.NamespacedName{Name: oldMariadbAccount.Spec.Secret, Namespace: oldMariadbAccount.Namespace})
406-
return dbSecret.Finalizers
407-
}, timeout, interval).ShouldNot(ContainElement(harness.finalizerName))
408-
409341
Eventually(func() []string {
410342
newMariadbAccount := mariaDBHelper.GetMariaDBAccount(newAccountName)
411343
dbSecret := harness.mariaDBHelper.GetSecret(types.NamespacedName{Name: newMariadbAccount.Spec.Secret, Namespace: newMariadbAccount.Namespace})

0 commit comments

Comments
 (0)