Adapt to lib-common fix in PR openstack-k8s-operators#231

In openstack-k8s-operators/lib-common#231 lib-common fixed typos in condition messages. This patch adapts our test to the changed messages
gibizer · Apr 4, 2023 · d97eaf5 · d97eaf5
1 parent 3d62572
commit d97eaf5
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 23 deletions.
diff --git a/test/functional/nova_metadata_controller_test.go b/test/functional/nova_metadata_controller_test.go
@@ -367,7 +367,7 @@ var _ = Describe("NovaMetadata controller", func() {
 				condition.NetworkAttachmentsReadyCondition,
 				corev1.ConditionFalse,
 				condition.ErrorReason,
-				"NetworkAttachments error occured "+
+				"NetworkAttachments error occurred "+
 					"not all pods have interfaces with ips as configured in NetworkAttachments: [internalapi]",
 			)
 		})
@@ -406,7 +406,7 @@ var _ = Describe("NovaMetadata controller", func() {
 				condition.NetworkAttachmentsReadyCondition,
 				corev1.ConditionFalse,
 				condition.ErrorReason,
-				"NetworkAttachments error occured "+
+				"NetworkAttachments error occurred "+
 					"not all pods have interfaces with ips as configured in NetworkAttachments: [internalapi]",
 			)
 		})
@@ -559,7 +559,7 @@ var _ = Describe("NovaMetadata controller", func() {
 				condition.NetworkAttachmentsReadyCondition,
 				corev1.ConditionFalse,
 				condition.ErrorReason,
-				"NetworkAttachments error occured "+
+				"NetworkAttachments error occurred "+
 					"not all pods have interfaces with ips as configured in NetworkAttachments: [internalapi]",
 			)
 			th.ExpectConditionWithDetails(
@@ -568,7 +568,7 @@ var _ = Describe("NovaMetadata controller", func() {
 				condition.ReadyCondition,
 				corev1.ConditionFalse,
 				condition.ErrorReason,
-				"NetworkAttachments error occured "+
+				"NetworkAttachments error occurred "+
 					"not all pods have interfaces with ips as configured in NetworkAttachments: [internalapi]",
 			)
 

diff --git a/test/functional/nova_scheduler_test.go b/test/functional/nova_scheduler_test.go
@@ -349,7 +349,7 @@ var _ = Describe("NovaScheduler controller", func() {
 				condition.NetworkAttachmentsReadyCondition,
 				corev1.ConditionFalse,
 				condition.ErrorReason,
-				"NetworkAttachments error occured "+
+				"NetworkAttachments error occurred "+
 					"not all pods have interfaces with ips as configured in NetworkAttachments: [internalapi]",
 			)
 		})
@@ -388,7 +388,7 @@ var _ = Describe("NovaScheduler controller", func() {
 				condition.NetworkAttachmentsReadyCondition,
 				corev1.ConditionFalse,
 				condition.ErrorReason,
-				"NetworkAttachments error occured "+
+				"NetworkAttachments error occurred "+
 					"not all pods have interfaces with ips as configured in NetworkAttachments: [internalapi]",
 			)
 		})
@@ -494,7 +494,7 @@ var _ = Describe("NovaScheduler controller", func() {
 				condition.NetworkAttachmentsReadyCondition,
 				corev1.ConditionFalse,
 				condition.ErrorReason,
-				"NetworkAttachments error occured "+
+				"NetworkAttachments error occurred "+
 					"not all pods have interfaces with ips as configured in NetworkAttachments: [internalapi]",
 			)
 
@@ -504,7 +504,7 @@ var _ = Describe("NovaScheduler controller", func() {
 				condition.ReadyCondition,
 				corev1.ConditionFalse,
 				condition.ErrorReason,
-				"NetworkAttachments error occured "+
+				"NetworkAttachments error occurred "+
 					"not all pods have interfaces with ips as configured in NetworkAttachments: [internalapi]",
 			)
 

diff --git a/test/functional/novaapi_controller_test.go b/test/functional/novaapi_controller_test.go
@@ -450,7 +450,7 @@ var _ = Describe("NovaAPI controller", func() {
 				condition.NetworkAttachmentsReadyCondition,
 				corev1.ConditionFalse,
 				condition.ErrorReason,
-				"NetworkAttachments error occured "+
+				"NetworkAttachments error occurred "+
 					"not all pods have interfaces with ips as configured in NetworkAttachments: [internalapi]",
 			)
 		})
@@ -489,7 +489,7 @@ var _ = Describe("NovaAPI controller", func() {
 				condition.NetworkAttachmentsReadyCondition,
 				corev1.ConditionFalse,
 				condition.ErrorReason,
-				"NetworkAttachments error occured "+
+				"NetworkAttachments error occurred "+
 					"not all pods have interfaces with ips as configured in NetworkAttachments: [internalapi]",
 			)
 		})
@@ -666,7 +666,7 @@ var _ = Describe("NovaAPI controller", func() {
 				condition.NetworkAttachmentsReadyCondition,
 				corev1.ConditionFalse,
 				condition.ErrorReason,
-				"NetworkAttachments error occured "+
+				"NetworkAttachments error occurred "+
 					"not all pods have interfaces with ips as configured in NetworkAttachments: [internalapi]",
 			)
 			th.ExpectConditionWithDetails(
@@ -675,7 +675,7 @@ var _ = Describe("NovaAPI controller", func() {
 				condition.ReadyCondition,
 				corev1.ConditionFalse,
 				condition.ErrorReason,
-				"NetworkAttachments error occured "+
+				"NetworkAttachments error occurred "+
 					"not all pods have interfaces with ips as configured in NetworkAttachments: [internalapi]",
 			)
 

diff --git a/test/functional/novacell_controller_test.go b/test/functional/novacell_controller_test.go
@@ -229,7 +229,7 @@ var _ = Describe("NovaCell controller", func() {
 				condition.NetworkAttachmentsReadyCondition,
 				corev1.ConditionFalse,
 				condition.ErrorReason,
-				"NetworkAttachments error occured "+
+				"NetworkAttachments error occurred "+
 					"not all pods have interfaces with ips as configured in NetworkAttachments: [internalapi]",
 			)
 
@@ -239,7 +239,7 @@ var _ = Describe("NovaCell controller", func() {
 				condition.ReadyCondition,
 				corev1.ConditionFalse,
 				condition.ErrorReason,
-				"NetworkAttachments error occured "+
+				"NetworkAttachments error occurred "+
 					"not all pods have interfaces with ips as configured in NetworkAttachments: [internalapi]",
 			)
 

diff --git a/test/functional/novaconductor_controller_test.go b/test/functional/novaconductor_controller_test.go
@@ -313,7 +313,7 @@ var _ = Describe("NovaConductor controller", func() {
 					condition.DBSyncReadyCondition,
 					corev1.ConditionFalse,
 					condition.ErrorReason,
-					"DBsync job error occured Internal error occurred: Job Failed. Check job logs",
+					"DBsync job error occurred Internal error occurred: Job Failed. Check job logs",
 				)
 				// This would fail the test case if the job does not exists
 				th.GetJob(jobName)
@@ -332,7 +332,7 @@ var _ = Describe("NovaConductor controller", func() {
 						condition.DBSyncReadyCondition,
 						corev1.ConditionFalse,
 						condition.ErrorReason,
-						"DBsync job error occured Internal error occurred: Job Failed. Check job logs",
+						"DBsync job error occurred Internal error occurred: Job Failed. Check job logs",
 					)
 
 					DeleteInstance(GetNovaConductor(novaConductorName))
@@ -452,7 +452,7 @@ var _ = Describe("NovaConductor controller", func() {
 				condition.DBSyncReadyCondition,
 				corev1.ConditionFalse,
 				condition.ErrorReason,
-				"DBsync job error occured Internal error occurred: Job Failed. Check job logs",
+				"DBsync job error occurred Internal error occurred: Job Failed. Check job logs",
 			)
 			Expect(th.GetJob(jobName).Spec.TTLSecondsAfterFinished).To(BeNil())
 		})
@@ -573,7 +573,7 @@ var _ = Describe("NovaConductor controller", func() {
 				condition.NetworkAttachmentsReadyCondition,
 				corev1.ConditionFalse,
 				condition.ErrorReason,
-				"NetworkAttachments error occured "+
+				"NetworkAttachments error occurred "+
 					"not all pods have interfaces with ips as configured in NetworkAttachments: [internalapi]",
 			)
 		})
@@ -613,7 +613,7 @@ var _ = Describe("NovaConductor controller", func() {
 				condition.NetworkAttachmentsReadyCondition,
 				corev1.ConditionFalse,
 				condition.ErrorReason,
-				"NetworkAttachments error occured "+
+				"NetworkAttachments error occurred "+
 					"not all pods have interfaces with ips as configured in NetworkAttachments: [internalapi]",
 			)
 		})
@@ -728,7 +728,7 @@ var _ = Describe("NovaConductor controller", func() {
 				condition.NetworkAttachmentsReadyCondition,
 				corev1.ConditionFalse,
 				condition.ErrorReason,
-				"NetworkAttachments error occured "+
+				"NetworkAttachments error occurred "+
 					"not all pods have interfaces with ips as configured in NetworkAttachments: [internalapi]",
 			)
 
@@ -738,7 +738,7 @@ var _ = Describe("NovaConductor controller", func() {
 				condition.ReadyCondition,
 				corev1.ConditionFalse,
 				condition.ErrorReason,
-				"NetworkAttachments error occured "+
+				"NetworkAttachments error occurred "+
 					"not all pods have interfaces with ips as configured in NetworkAttachments: [internalapi]",
 			)
 

diff --git a/test/functional/novaexternalcompute_controller_test.go b/test/functional/novaexternalcompute_controller_test.go
@@ -208,7 +208,7 @@ var _ = Describe("NovaExternalCompute", func() {
 				condition.InputReadyCondition,
 				corev1.ConditionFalse,
 				condition.ErrorReason,
-				"Input data error occured field 'inventory' not found in configmap/"+compute.Spec.InventoryConfigMapName,
+				"Input data error occurred field 'inventory' not found in configmap/"+compute.Spec.InventoryConfigMapName,
 			)
 			compute = GetNovaExternalCompute(computeName)
 			Expect(compute.Status.Hash["input"]).To(BeEmpty())
@@ -243,7 +243,7 @@ var _ = Describe("NovaExternalCompute", func() {
 				condition.InputReadyCondition,
 				corev1.ConditionFalse,
 				condition.ErrorReason,
-				"Input data error occured field 'ssh-privatekey' not found in secret/"+compute.Spec.SSHKeySecretName,
+				"Input data error occurred field 'ssh-privatekey' not found in secret/"+compute.Spec.SSHKeySecretName,
 			)
 			compute = GetNovaExternalCompute(computeName)
 			Expect(compute.Status.Hash["input"]).To(BeEmpty())