Skip to content

Commit 2e993ac

Browse files
committed
[functional] verify LastAppliedTopology != nil before checking name
Related: OSPRH-14494 Signed-off-by: Martin Schuppert <mschuppert@redhat.com>
1 parent 6952fcf commit 2e993ac

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

tests/functional/ironic_controller_test.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,10 +287,13 @@ var _ = Describe("Ironic controller", func() {
287287
It("sets topology in CR status", func() {
288288
Eventually(func(g Gomega) {
289289
ironicAPI := GetIronicAPI(ironicNames.APIName)
290+
g.Expect(ironicAPI.Status.LastAppliedTopology).ToNot(BeNil())
290291
g.Expect(ironicAPI.Status.LastAppliedTopology.Name).To(Equal(ironicNames.IronicTopologies[0].Name))
291292
ironicConductor := GetIronicConductor(ironicNames.ConductorName)
293+
g.Expect(ironicConductor.Status.LastAppliedTopology).ToNot(BeNil())
292294
g.Expect(ironicConductor.Status.LastAppliedTopology.Name).To(Equal(ironicNames.IronicTopologies[0].Name))
293295
ironicInspector := GetIronicInspector(ironicNames.InspectorName)
296+
g.Expect(ironicInspector.Status.LastAppliedTopology).ToNot(BeNil())
294297
g.Expect(ironicInspector.Status.LastAppliedTopology.Name).To(Equal(ironicNames.IronicTopologies[0].Name))
295298
}, timeout, interval).Should(Succeed())
296299
})
@@ -315,10 +318,13 @@ var _ = Describe("Ironic controller", func() {
315318

316319
Eventually(func(g Gomega) {
317320
ironicAPI := GetIronicAPI(ironicNames.APIName)
321+
g.Expect(ironicAPI.Status.LastAppliedTopology).ToNot(BeNil())
318322
g.Expect(ironicAPI.Status.LastAppliedTopology.Name).To(Equal(ironicNames.IronicTopologies[1].Name))
319323
ironicConductor := GetIronicConductor(ironicNames.ConductorName)
324+
g.Expect(ironicConductor.Status.LastAppliedTopology).ToNot(BeNil())
320325
g.Expect(ironicConductor.Status.LastAppliedTopology.Name).To(Equal(ironicNames.IronicTopologies[1].Name))
321326
ironicInspector := GetIronicInspector(ironicNames.InspectorName)
327+
g.Expect(ironicInspector.Status.LastAppliedTopology).ToNot(BeNil())
322328
g.Expect(ironicInspector.Status.LastAppliedTopology.Name).To(Equal(ironicNames.IronicTopologies[1].Name))
323329
}, timeout, interval).Should(Succeed())
324330
})
@@ -342,10 +348,13 @@ var _ = Describe("Ironic controller", func() {
342348

343349
Eventually(func(g Gomega) {
344350
ironicAPI := GetIronicAPI(ironicNames.APIName)
351+
g.Expect(ironicAPI.Status.LastAppliedTopology).ToNot(BeNil())
345352
g.Expect(ironicAPI.Status.LastAppliedTopology.Name).To(Equal(ironicNames.IronicTopologies[1].Name))
346353
ironicConductor := GetIronicConductor(ironicNames.ConductorName)
354+
g.Expect(ironicConductor.Status.LastAppliedTopology).ToNot(BeNil())
347355
g.Expect(ironicConductor.Status.LastAppliedTopology.Name).To(Equal(ironicNames.IronicTopologies[2].Name))
348356
ironicInspector := GetIronicInspector(ironicNames.InspectorName)
357+
g.Expect(ironicInspector.Status.LastAppliedTopology).ToNot(BeNil())
349358
g.Expect(ironicInspector.Status.LastAppliedTopology.Name).To(Equal(ironicNames.IronicTopologies[3].Name))
350359
}, timeout, interval).Should(Succeed())
351360
})

0 commit comments

Comments
 (0)