diff --git a/tests2/common/base_fw_upgrade_test.py b/tests2/common/base_fw_upgrade_test.py index 12727fb6692..bba13b6cf38 100755 --- a/tests2/common/base_fw_upgrade_test.py +++ b/tests2/common/base_fw_upgrade_test.py @@ -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): diff --git a/tools/fw_upgrade/entity_upgrader.py b/tools/fw_upgrade/entity_upgrader.py index a5e908f308a..27e44a0d9e2 100644 --- a/tools/fw_upgrade/entity_upgrader.py +++ b/tools/fw_upgrade/entity_upgrader.py @@ -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 @@ -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 @@ -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) ) ) @@ -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: