Skip to content

fw_upgrade: fix 'occured' -> 'occurred' in upgrade log/error messages #264

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 2 commits into from
+5 −5
Closed

fw_upgrade: fix 'occured' -> 'occurred' in upgrade log/error messages #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc9b6d8
fw_upgrade: fix 'occured' -> 'occurred' in entity_upgrader log messages
SAY-5 Apr 16, 2026
2426217
fix same typo in base_fw_upgrade_test.py
SAY-5 Apr 16, 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 tests2/common/base_fw_upgrade_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ def check_entity_condition(self, condition_cmd=None) -> bool:
return False
return True
except Exception as e:
Logger.info("Exception {} occured when running command".format(e))
Logger.info("Exception {} occurred when running command".format(e))
return False

def checking_components_version(self, components=None, logging=False):
Expand Down
8 changes: 4 additions & 4 deletions tools/fw_upgrade/entity_upgrader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ def _run_cmd_on_oob(self, cmd_to_execute: str) -> int:
subprocess.check_call(cmd_to_execute, shell=True, stderr=subprocess.STDOUT)
return 0
except subprocess.CalledProcessError as e:
logging.info("Exception {} occured when running command".format(e))
logging.info("Exception {} occurred when running command".format(e))
return e.returncode

# Step 4
Expand All @@ -275,7 +275,7 @@ def _upgrade_executor(self, filename: str, instance_specifier=None):
instance_successful = return_code == 0
if not instance_successful:
logging.info(
"=== Error occured with return code : {}".format(str(return_code))
"=== Error occurred with return code : {}".format(str(return_code))
)
return return_code, instance_successful

Expand Down Expand Up @@ -381,7 +381,7 @@ def upgrade_entity(self) -> List:
# Otherwise, check if continue_on_error field is set in JSON
if self._is_continue_on_error_set_in_json():
logging.info(
"=== Error occured with return code : {}".format(
"=== Error occurred with return code : {}".format(
str(return_code)
)
)
Expand Down Expand Up @@ -432,7 +432,7 @@ def _is_condition_set_in_json(self, instance_specifier=None) -> bool:
subprocess.check_output(cmd_to_execute, shell=True) # noqa p204
return True
except subprocess.CalledProcessError as e:
logging.info("Exception {} occured when running command".format(e))
logging.info("Exception {} occurred when running command".format(e))
return False

def _is_continue_on_error_set_in_json(self) -> bool:
Expand Down