Skip to content

Fix 'occured' -> 'occurred' typos across e2e tests and monitors (8 files, 31 instances) #31026

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
SAY-5 wants to merge 8 commits into from
Closed

Fix 'occured' -> 'occurred' typos across e2e tests and monitors (8 files, 31 instances) #31026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
26230c2
Fix occured typo in monitortest.go
SAY-5 Apr 17, 2026
92185f9
Fix occured typo in disruption.go
SAY-5 Apr 17, 2026
d4f3823
Fix occured typo in kernel_rt_latency.go
SAY-5 Apr 17, 2026
8625497
Fix occured typo in kernel_rt_functional.go
SAY-5 Apr 17, 2026
20eba61
Fix occured typo in machine_config_node.go
SAY-5 Apr 17, 2026
5f4569d
Fix occured typo in machines.go
SAY-5 Apr 17, 2026
e5ab29a
Fix occured typo in helpers.go
SAY-5 Apr 17, 2026
9c4b011
Fix occured typo in pinnedimages.go
SAY-5 Apr 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/monitortests/monitoring/statefulsetsrecreation/monitortest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ func (sc *statefulsetsChecker) getStatefulsetsUID(ctx context.Context) (map[stri
err = fmt.Errorf("%w: lastError: %w", err, lastErr)
}
logrus.Infof(
"Error occured while getting statefulset %s/%s: %v",
"Error occurred while getting statefulset %s/%s: %v",
openshiftMonitoringNs,
statefulsetName,
err,
Expand Down
6 changes: 3 additions & 3 deletions test/extended/kernel/kernel_rt_functional.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@ var _ = g.Describe("[sig-node][Suite:openshift/nodes/realtime][Disruptive] Real

g.It("pi_stress to run successfully with the fifo algorithm", func() {
err := runPiStressFifo(oc)
o.Expect(err).NotTo(o.HaveOccurred(), "error occured running pi_stress with the fifo algorithm")
o.Expect(err).NotTo(o.HaveOccurred(), "error occurred running pi_stress with the fifo algorithm")
})

g.It("pi_stress to run successfully with the round robin algorithm", func() {
err := runPiStressRR(oc)
o.Expect(err).NotTo(o.HaveOccurred(), "error occured running pi_stress with the round robin algorithm")
o.Expect(err).NotTo(o.HaveOccurred(), "error occurred running pi_stress with the round robin algorithm")
})

g.It("deadline_test to run successfully", func() {
err := runDeadlineTest(oc)
o.Expect(err).NotTo(o.HaveOccurred(), "error occured running deadline_test")
o.Expect(err).NotTo(o.HaveOccurred(), "error occurred running deadline_test")
})

g.AfterEach(func() {
Expand Down
6 changes: 3 additions & 3 deletions test/extended/kernel/kernel_rt_latency.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,23 @@ var _ = g.Describe("[sig-node][Suite:openshift/nodes/realtime/latency][Disruptiv

g.It("hwlatdetect", func() {
err := runHwlatdetect(oc)
o.Expect(err).NotTo(o.HaveOccurred(), "error occured running hwlatdetect")
o.Expect(err).NotTo(o.HaveOccurred(), "error occurred running hwlatdetect")
})

g.It("oslat", func() {
cpuCount, err := getProcessorCount(oc)
o.Expect(err).NotTo(o.HaveOccurred(), "unable to get the number of processors online")

err = runOslat(cpuCount, oc)
o.Expect(err).NotTo(o.HaveOccurred(), "error occured running oslat")
o.Expect(err).NotTo(o.HaveOccurred(), "error occurred running oslat")
})

g.It("cyclictest", func() {
cpuCount, err := getProcessorCount(oc)
o.Expect(err).NotTo(o.HaveOccurred(), "unable to get the number of processors online")

err = runCyclictest(cpuCount, oc)
o.Expect(err).NotTo(o.HaveOccurred(), "error occured running cyclictest")
o.Expect(err).NotTo(o.HaveOccurred(), "error occurred running cyclictest")
})

g.AfterEach(func() {
Expand Down
2 changes: 1 addition & 1 deletion test/extended/machine_config/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@ func WaitForMCNConditionStatus(clientSet *machineconfigclient.Clientset, mcnName
framework.Logf("The desired MCN condition was never met: %v", err)
// Handle the situation where there were errors getting the MCN resource
if conditionErr != nil {
framework.Logf("An error occured waiting for MCN '%v' %v condition to be %v: %v", mcnName, conditionType, status, conditionErr)
framework.Logf("An error occurred waiting for MCN '%v' %v condition to be %v: %v", mcnName, conditionType, status, conditionErr)
return conditionMet, fmt.Errorf("MCN '%v' %v condition was not %v: %v", mcnName, conditionType, status, conditionErr)
}
// Handle case when no errors occur grabbing the MCN, but we time out waiting for the condition to be in the desired state
Expand Down
36 changes: 18 additions & 18 deletions test/extended/machine_config/machine_config_node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,87 +302,87 @@ func validateTransitionThroughConditions(clientSet *machineconfigclient.Clientse
// a warning will be logged instead of erroring out the test.
framework.Logf("Waiting for Updated=False")
conditionMet, err := WaitForMCNConditionStatus(clientSet, updatingNodeName, mcfgv1.MachineConfigNodeUpdated, metav1.ConditionFalse, 1*time.Minute, 1*time.Second)
o.Expect(err).NotTo(o.HaveOccurred(), fmt.Sprintf("Error occured while waiting for Updated=False: %v", err))
o.Expect(err).NotTo(o.HaveOccurred(), fmt.Sprintf("Error occurred while waiting for Updated=False: %v", err))
o.Expect(conditionMet).To(o.BeTrue(), "Error, could not detect Updated=False.")

framework.Logf("Waiting for UpdatePrepared=True")
conditionMet, err = WaitForMCNConditionStatus(clientSet, updatingNodeName, mcfgv1.MachineConfigNodeUpdatePrepared, metav1.ConditionTrue, 1*time.Minute, 1*time.Second)
o.Expect(err).NotTo(o.HaveOccurred(), fmt.Sprintf("Error occured while waiting for UpdatePrepared=True: %v", err))
o.Expect(err).NotTo(o.HaveOccurred(), fmt.Sprintf("Error occurred while waiting for UpdatePrepared=True: %v", err))
o.Expect(conditionMet).To(o.BeTrue(), "Error, could not detect UpdatePrepared=True.")

framework.Logf("Waiting for UpdateExecuted=Unknown")
conditionMet, err = WaitForMCNConditionStatus(clientSet, updatingNodeName, mcfgv1.MachineConfigNodeUpdateExecuted, metav1.ConditionUnknown, 30*time.Second, 1*time.Second)
o.Expect(err).NotTo(o.HaveOccurred(), fmt.Sprintf("Error occured while waiting for UpdateExecuted=Unknown: %v", err))
o.Expect(err).NotTo(o.HaveOccurred(), fmt.Sprintf("Error occurred while waiting for UpdateExecuted=Unknown: %v", err))
o.Expect(conditionMet).To(o.BeTrue(), "Error, could not detect UpdateExecuted=Unknown.")

// On standard, non-rebootless, update, check that node transitions through "Cordoned" and "Drained" phases
if !isRebootless {
framework.Logf("Waiting for Cordoned=True")
conditionMet, err = WaitForMCNConditionStatus(clientSet, updatingNodeName, mcfgv1.MachineConfigNodeUpdateCordoned, metav1.ConditionTrue, 30*time.Second, 1*time.Second)
o.Expect(err).NotTo(o.HaveOccurred(), fmt.Sprintf("Error occured while waiting for Cordoned=True: %v", err))
o.Expect(err).NotTo(o.HaveOccurred(), fmt.Sprintf("Error occurred while waiting for Cordoned=True: %v", err))
o.Expect(conditionMet).To(o.BeTrue(), "Error, could not detect Cordoned=True.")

framework.Logf("Waiting for Drained=Unknown")
conditionMet, err = WaitForMCNConditionStatus(clientSet, updatingNodeName, mcfgv1.MachineConfigNodeUpdateDrained, metav1.ConditionUnknown, 15*time.Second, 1*time.Second)
o.Expect(err).NotTo(o.HaveOccurred(), fmt.Sprintf("Error occured while waiting for Drained=Unknown: %v", err))
o.Expect(err).NotTo(o.HaveOccurred(), fmt.Sprintf("Error occurred while waiting for Drained=Unknown: %v", err))
o.Expect(conditionMet).To(o.BeTrue(), "Error, could not detect Drained=Unknown.")

framework.Logf("Waiting for Drained=True")
conditionMet, err = WaitForMCNConditionStatus(clientSet, updatingNodeName, mcfgv1.MachineConfigNodeUpdateDrained, metav1.ConditionTrue, 4*time.Minute, 1*time.Second)
o.Expect(err).NotTo(o.HaveOccurred(), fmt.Sprintf("Error occured while waiting for Drained=True: %v", err))
o.Expect(err).NotTo(o.HaveOccurred(), fmt.Sprintf("Error occurred while waiting for Drained=True: %v", err))
o.Expect(conditionMet).To(o.BeTrue(), "Error, could not detect Drained=True.")
}

framework.Logf("Waiting for AppliedFilesAndOS=Unknown")
conditionMet, err = WaitForMCNConditionStatus(clientSet, updatingNodeName, mcfgv1.MachineConfigNodeUpdateFilesAndOS, metav1.ConditionUnknown, 30*time.Second, 1*time.Second)
o.Expect(err).NotTo(o.HaveOccurred(), fmt.Sprintf("Error occured while waiting for AppliedFilesAndOS=Unknown: %v", err))
o.Expect(err).NotTo(o.HaveOccurred(), fmt.Sprintf("Error occurred while waiting for AppliedFilesAndOS=Unknown: %v", err))
o.Expect(conditionMet).To(o.BeTrue(), "Error, could not detect AppliedFilesAndOS=Unknown.")

framework.Logf("Waiting for AppliedFilesAndOS=True")
conditionMet, err = WaitForMCNConditionStatus(clientSet, updatingNodeName, mcfgv1.MachineConfigNodeUpdateFilesAndOS, metav1.ConditionTrue, 3*time.Minute, 1*time.Second)
o.Expect(err).NotTo(o.HaveOccurred(), fmt.Sprintf("Error occured while waiting for AppliedFilesAndOS=True: %v", err))
o.Expect(err).NotTo(o.HaveOccurred(), fmt.Sprintf("Error occurred while waiting for AppliedFilesAndOS=True: %v", err))
o.Expect(conditionMet).To(o.BeTrue(), "Error, could not detect AppliedFilesAndOS=True.")

framework.Logf("Waiting for UpdateExecuted=True")
conditionMet, err = WaitForMCNConditionStatus(clientSet, updatingNodeName, mcfgv1.MachineConfigNodeUpdateExecuted, metav1.ConditionTrue, 20*time.Second, 1*time.Second)
o.Expect(err).NotTo(o.HaveOccurred(), fmt.Sprintf("Error occured while waiting for UpdateExecuted=True: %v", err))
o.Expect(err).NotTo(o.HaveOccurred(), fmt.Sprintf("Error occurred while waiting for UpdateExecuted=True: %v", err))
o.Expect(conditionMet).To(o.BeTrue(), "Error, could not detect UpdateExecuted=True.")

// On rebootless update, check that node transitions through "UpdatePostActionComplete" phase
if isRebootless {
framework.Logf("Waiting for UpdatePostActionComplete=True")
conditionMet, err = WaitForMCNConditionStatus(clientSet, updatingNodeName, mcfgv1.MachineConfigNodeUpdatePostActionComplete, metav1.ConditionTrue, 1*time.Minute, 1*time.Second)
o.Expect(err).NotTo(o.HaveOccurred(), fmt.Sprintf("Error occured while waiting for UpdatePostActionComplete=True: %v", err))
o.Expect(err).NotTo(o.HaveOccurred(), fmt.Sprintf("Error occurred while waiting for UpdatePostActionComplete=True: %v", err))
o.Expect(conditionMet).To(o.BeTrue(), "Error, could not detect UpdatePostActionComplete=True.")
} else { // On standard, non-rebootless, update, check that node transitions through "RebootedNode" phase
framework.Logf("Waiting for RebootedNode=Unknown")
conditionMet, err = WaitForMCNConditionStatus(clientSet, updatingNodeName, mcfgv1.MachineConfigNodeUpdateRebooted, metav1.ConditionUnknown, 15*time.Second, 1*time.Second)
o.Expect(err).NotTo(o.HaveOccurred(), fmt.Sprintf("Error occured while waiting for RebootedNode=Unknown: %v", err))
o.Expect(err).NotTo(o.HaveOccurred(), fmt.Sprintf("Error occurred while waiting for RebootedNode=Unknown: %v", err))
o.Expect(conditionMet).To(o.BeTrue(), "Error, could not detect RebootedNode=Unknown.")

framework.Logf("Waiting for RebootedNode=True")
conditionMet, err = WaitForMCNConditionStatus(clientSet, updatingNodeName, mcfgv1.MachineConfigNodeUpdateRebooted, metav1.ConditionTrue, 6*time.Minute, 1*time.Second)
o.Expect(err).NotTo(o.HaveOccurred(), fmt.Sprintf("Error occured while waiting for RebootedNode=True: %v", err))
o.Expect(err).NotTo(o.HaveOccurred(), fmt.Sprintf("Error occurred while waiting for RebootedNode=True: %v", err))
o.Expect(conditionMet).To(o.BeTrue(), "Error, could not detect RebootedNode=True.")
}
framework.Logf("Waiting for Resumed=True")
conditionMet, err = WaitForMCNConditionStatus(clientSet, updatingNodeName, mcfgv1.MachineConfigNodeResumed, metav1.ConditionTrue, 15*time.Second, 1*time.Second)
o.Expect(err).NotTo(o.HaveOccurred(), fmt.Sprintf("Error occured while waiting for Resumed=True: %v", err))
o.Expect(err).NotTo(o.HaveOccurred(), fmt.Sprintf("Error occurred while waiting for Resumed=True: %v", err))
o.Expect(conditionMet).To(o.BeTrue(), "Error, could not detect Resumed=True.")

framework.Logf("Waiting for UpdateComplete=True")
conditionMet, err = WaitForMCNConditionStatus(clientSet, updatingNodeName, mcfgv1.MachineConfigNodeUpdateComplete, metav1.ConditionTrue, 10*time.Second, 1*time.Second)
o.Expect(err).NotTo(o.HaveOccurred(), fmt.Sprintf("Error occured while waiting for UpdateComplete=True: %v", err))
o.Expect(err).NotTo(o.HaveOccurred(), fmt.Sprintf("Error occurred while waiting for UpdateComplete=True: %v", err))
o.Expect(conditionMet).To(o.BeTrue(), "Error, could not detect UpdateComplete=True.")

framework.Logf("Waiting for Uncordoned=True")
conditionMet, err = WaitForMCNConditionStatus(clientSet, updatingNodeName, mcfgv1.MachineConfigNodeUpdateUncordoned, metav1.ConditionTrue, 10*time.Second, 1*time.Second)
o.Expect(err).NotTo(o.HaveOccurred(), fmt.Sprintf("Error occured while waiting for UpdateComplete=True: %v", err))
o.Expect(err).NotTo(o.HaveOccurred(), fmt.Sprintf("Error occurred while waiting for UpdateComplete=True: %v", err))
o.Expect(conditionMet).To(o.BeTrue(), "Error, could not detect UpdateComplete=True.")

Comment on lines 378 to 382
Copy link
Copy Markdown

@coderabbitai coderabbitai Bot Apr 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Assertion message mismatches the condition being validated.

At Line 379 you wait for Uncordoned=True, but Lines 380-381 still say UpdateComplete=True. This makes failures misleading.

Suggested patch 
-	o.Expect(err).NotTo(o.HaveOccurred(), fmt.Sprintf("Error occurred while waiting for UpdateComplete=True: %v", err))
-	o.Expect(conditionMet).To(o.BeTrue(), "Error, could not detect UpdateComplete=True.")
+	o.Expect(err).NotTo(o.HaveOccurred(), fmt.Sprintf("Error occurred while waiting for Uncordoned=True: %v", err))
+	o.Expect(conditionMet).To(o.BeTrue(), "Error, could not detect Uncordoned=True.")
🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In `@test/extended/machine_config/machine_config_node.go` around lines 378 - 382,
The assertions after calling WaitForMCNConditionStatus are checking for
Uncordoned=True but their failure messages still refer to UpdateComplete=True;
update the two messages to match the actual condition being waited on: when
calling WaitForMCNConditionStatus(clientSet, updatingNodeName,
mcfgv1.MachineConfigNodeUpdateUncordoned, metav1.ConditionTrue, ...), change the
fmt.Sprintf error text and the o.Expect(...).To(o.BeTrue(), ...) message so they
mention "Uncordoned=True" (or similar clear text) instead of
"UpdateComplete=True" to avoid misleading failures.

framework.Logf("Waiting for Updated=True")
conditionMet, err = WaitForMCNConditionStatus(clientSet, updatingNodeName, mcfgv1.MachineConfigNodeUpdated, metav1.ConditionTrue, 1*time.Minute, 1*time.Second)
o.Expect(err).NotTo(o.HaveOccurred(), fmt.Sprintf("Error occured while waiting for Updated=True: %v", err))
o.Expect(err).NotTo(o.HaveOccurred(), fmt.Sprintf("Error occurred while waiting for Updated=True: %v", err))
o.Expect(conditionMet).To(o.BeTrue(), "Error, could not detect Updated=True.")
}

Expand Down Expand Up @@ -414,7 +414,7 @@ func ValidateMCNConditionOnNodeDegrade(oc *exutil.CLI, fixture string, isSno boo
// If the test reached checking the MCN ensure the NodeDegraded condition is properly restored
if degradedNodeMCN != nil {
conditionMet, err := WaitForMCNConditionStatus(clientSet, degradedNodeMCN.Name, mcfgv1.MachineConfigNodeNodeDegraded, metav1.ConditionFalse, 30*time.Second, 1*time.Second)
o.Expect(err).NotTo(o.HaveOccurred(), fmt.Sprintf("Error occured while waiting for NodeDegraded=False: %v", err))
o.Expect(err).NotTo(o.HaveOccurred(), fmt.Sprintf("Error occurred while waiting for NodeDegraded=False: %v", err))
o.Expect(conditionMet).To(o.BeTrue(), "Error, could not detect NodeDegraded=False.")
}
}()
Expand Down Expand Up @@ -478,7 +478,7 @@ func ValidateMCNOnNodeCreationAndDeletion(oc *exutil.CLI) {

// Skip test if worker nodes cannot be scaled
canBeScaled, canScaleErr := WorkersCanBeScaled(oc, machineClient)
o.Expect(canScaleErr).NotTo(o.HaveOccurred(), "Error occured when determining whether worker nodes can be scaled.")
o.Expect(canScaleErr).NotTo(o.HaveOccurred(), "Error occurred when determining whether worker nodes can be scaled.")
if !canBeScaled {
g.Skip("Worker nodes cannot be scaled using MachineSets. This test cannot be executed if workers cannot be scaled via MachineSets.")
}
Expand Down
2 changes: 1 addition & 1 deletion test/extended/machine_config/pinnedimages.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,7 @@ func waitForPISStatusX(ctx context.Context, oc *exutil.CLI, kubeClient *kubernet
if !success { // handle case when we are expecting the PIS application to fail, so the PIS degraded condition should become true
framework.Logf("Waiting for PinnedImageSetsDegraded=True")
conditionMet, err := WaitForMCNConditionStatus(clientSet, node.Name, mcfgv1.MachineConfigNodePinnedImageSetsDegraded, metav1.ConditionTrue, 2*time.Minute, 5*time.Second)
o.Expect(err).NotTo(o.HaveOccurred(), fmt.Sprintf("Error occured while waiting for PinnedImageSetsDegraded=True: %v", err))
o.Expect(err).NotTo(o.HaveOccurred(), fmt.Sprintf("Error occurred while waiting for PinnedImageSetsDegraded=True: %v", err))
o.Expect(conditionMet).To(o.BeTrue(), "Error, could not detect PinnedImageSetsDegraded=True.")
Comment on lines +499 to 500
Copy link
Copy Markdown

@coderabbitai coderabbitai Bot Apr 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Minor consistency follow-up: nearby comment still has a typo.

Line 499 is fixed, but Line 518 still says "occured" in the comment.

Suggested patch 
-			// If we make it here, it means no fatal or non-fatal error has occured & the PIS application conditions were met
+			// If we make it here, it means no fatal or non-fatal error has occurred & the PIS application conditions were met

Also applies to: 518-519

🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In `@test/extended/machine_config/pinnedimages.go` around lines 499 - 500, The
test contains a typo "occured" in a nearby comment; update the comment(s) that
mention the error message to use the correct spelling "occurred" (search for the
string "occured" around the o.Expect(...) assertions in pinnedimages.go,
including the occurrences near the o.Expect(err).NotTo(o.HaveOccurred(...)) line
and the lines around the PinnedImageSetsDegraded=True check) so all comments
consistently read "occurred".

} else { // handle cases where we are expecting the PIS application to succeed
mcn, err := clientSet.MachineconfigurationV1().MachineConfigNodes().Get(ctx, node.Name, metav1.GetOptions{})
Expand Down