update spelling + fixes

ngrozae · ngrozae · commit 8d7b9967df1f · 2026-05-12T11:13:24.000+02:00
diff --git a/tests/functional/config.py b/tests/functional/config.py
@@ -243,7 +243,7 @@ def get_uses_mapping():
 save_image_to_artifacts = get_bool("TT_SAVE_IMAGE_TO_ARTIFACTS", False)
 
 """TT_SET_NO_PROXY"""
-set_no_proxy = os.environ.get("TT_SET_NO_PROXY", True)
+set_no_proxy = get_bool("TT_SET_NO_PROXY", True)
 no_proxy = os.environ.get("no_proxy", "")
 if set_no_proxy:
     os.environ["NO_PROXY"] = no_proxy
diff --git a/tests/functional/constants/ovms_messages.py b/tests/functional/constants/ovms_messages.py
@@ -256,7 +256,7 @@ class OvmsMessages:
     ERROR_EXCEPTION_CATCH = "Exception catch:"
 
     CPU_EXTENSION_LOADING_CUSTOM_CPU_EXT = "Loading custom CPU extension from {}"
-    CPU_EXTENSION_LOADED = "Custom CPU extention loaded. Adding it."
+    CPU_EXTENSION_LOADED = "Custom CPU extension loaded. Adding it."
     CPU_EXTENSION_ADDED = "Extension added."
 
     ERROR_CPU_EXTENSION_WILL_NOW_TERMINATE = "- will now terminate."
diff --git a/tests/functional/constants/paths.py b/tests/functional/constants/paths.py
@@ -68,7 +68,7 @@ def get_target_device_lock_file(target_device, i):
         if isinstance(target_device, str):
             assert not all(x in target_device for x in [TargetDevice.GPU, TargetDevice.NPU])
 
-            # generalize HETERO/AUTO/MUTLI:X => `X`
+            # generalize HETERO/AUTO/MULTI:X => `X`
             if TargetDevice.GPU in target_device:
                 return os.path.join(config.ovms_file_locks_dir, f"target_device_{TargetDevice.GPU}_{i}.lock")
             if TargetDevice.NPU in target_device:
diff --git a/tests/functional/data/ovms_capi_wrapper/ovms_autopxd.py b/tests/functional/data/ovms_capi_wrapper/ovms_autopxd.py
@@ -73,5 +73,5 @@ def translate(self, code):
     input_file_path = Path(args.input_file)
     output_file_path = Path(args.output_file)
 
-    with open(output_file_path, "w") as fo:
-        fo.write(OvmsAutoPxd(input_file_path.name).translate(input_file_path.read_text()))
+    with open(output_file_path, "w") as file_object:
+        file_object.write(OvmsAutoPxd(input_file_path.name).translate(input_file_path.read_text()))
diff --git a/tests/functional/object_model/custom_node.py b/tests/functional/object_model/custom_node.py
@@ -140,7 +140,9 @@ def __post_init__(self):
 @dataclass
 class OvmsTestDevCustomNode(DevCustomNode):
     def __post_init__(self):
-        self.src_dir = os.path.join(ovms_test_repo_path, "data", "ovms_testing_image", Paths.CUSTOM_NODE_PATH_NAME)
+        self.src_dir = os.path.join(
+            ovms_c_repo_path, "tests", "functional", "utils", "ovms_testing_image", Paths.CUSTOM_NODE_PATH_NAME
+        )
         self.src_file_path = os.path.join(self.src_dir, self.name, f"{self.name}.{self.src_type}")
         super().__post_init__()
 
diff --git a/tests/functional/object_model/ovms_docker.py b/tests/functional/object_model/ovms_docker.py
@@ -643,7 +643,7 @@ def __init__(self, docker_id, name, container_folder, rest_port, grpc_port, targ
         )
 
     def fetch_and_store_ovms_pid(self, timeout=60):
-        self._dmesg_log.ovms_pid = None  # Not implemetned yet
+        self._dmesg_log.ovms_pid = None  # Not implemented yet
 
     def _create_logger(self):
         return OvmsCmdLineDockerLogMonitor(self.docker_id)
diff --git a/tests/functional/object_model/python_custom_nodes/python_custom_nodes.py b/tests/functional/object_model/python_custom_nodes/python_custom_nodes.py
@@ -137,8 +137,8 @@ def get_expected_output(self, input_data: dict, client_type: str = None):
                 # For REST API and BYTES type, every batch is always preceding by the 4 bytes, that contains its size
                 # [42, 0, 0, 0] is constant value for "Lorem ipsum dolor sit amet"
                 # https://github.com/openvinotoolkit/model_server/blob/main/docs/model_server_rest_api_kfs.md
-                splitted = np.array_split(np.array(char_array, dtype=np.object_), multiply_value)
-                extended_with_length = [np.insert(elem, 0, [42, 0, 0, 0]) for elem in splitted]
+                elements = np.array_split(np.array(char_array, dtype=np.object_), multiply_value)
+                extended_with_length = [np.insert(elem, 0, [42, 0, 0, 0]) for elem in elements]
                 output_data[self.output_names[i]] = np.concatenate(extended_with_length, dtype=np.object_)
 
         return output_data
diff --git a/tests/functional/object_model/resource_monitor.py b/tests/functional/object_model/resource_monitor.py
@@ -66,6 +66,8 @@ class DockerResourceMonitor(ResourceMonitor):
         # "CPU_USAGE": lambda x:
         #     [cpu / x['cpu_stats']['cpu_usage']['total_usage'] for cpu in x['cpu_stats']['cpu_usage']['percpu_usage']],
     }
+    # Optional callback invoked after save_data with (log_path).
+    on_data_saved = None
 
     def __init__(self, container):
         super().__init__()
@@ -96,6 +98,8 @@ def save_data(self):
             writer = csv.DictWriter(csvfile, fieldnames=DockerResourceMonitor.FIELDS)
             writer.writeheader()
             writer.writerows(self.rows)
+        if DockerResourceMonitor.on_data_saved:
+            DockerResourceMonitor.on_data_saved(log_path)
         return log_path
 
     def plot_fo_file(self, x, y, field, filename):
diff --git a/tests/functional/object_model/test_environment.py b/tests/functional/object_model/test_environment.py
@@ -37,11 +37,11 @@ def update_model_files(model, models_dir):
         if hasattr(model, "max_position_embeddings") and model.max_position_embeddings is not None:
             config_file_path = os.path.join(models_dir[0], model.name, "config.json")
             if os.path.exists(config_file_path):
-                with open(config_file_path, "r") as fo:
-                    config_data = json.load(fo)
+                with open(config_file_path, "r") as file_object:
+                    config_data = json.load(file_object)
                 config_data["max_position_embeddings"] = model.max_position_embeddings
-                with open(config_file_path, "w") as fo:
-                    json.dump(config_data, fo)
+                with open(config_file_path, "w") as file_object:
+                    json.dump(config_data, file_object)
                 logger.info(
                     f"max_position_embeddings value was updated to {model.max_position_embeddings} "
                     f"in model's config file: {config_file_path}."
diff --git a/tests/functional/utils/docker.py b/tests/functional/utils/docker.py
@@ -107,6 +107,8 @@ class DockerContainer(metaclass=ABCMeta):
     NOT_ON_LIST_RETRY = {"tries": 10, "delay": 2}
     GETTING_LOGS_RETRY = COMMON_RETRY
     GETTING_STATUS_RETRY = COMMON_RETRY
+    # Optional callback invoked before log check with (container_name).
+    on_log_check = None
 
     def __init__(
         self,
@@ -289,6 +291,8 @@ def check_non_empty_logs(self, specific_str: str, acceptable_logs_length_trigger
     def ensure_logs_contain_specific_str(
         self, specific_str: str, acceptable_logs_length_trigger: int = 0, retry_kwargs: dict = None, **kwargs
     ):
+        if DockerContainer.on_log_check:
+            DockerContainer.on_log_check(self.name)
         args = [specific_str, acceptable_logs_length_trigger]
         getting_logs_retry = self.GETTING_LOGS_RETRY.copy()
         if retry_kwargs:
diff --git a/tests/functional/utils/hooks.py b/tests/functional/utils/hooks.py
@@ -92,7 +92,7 @@ def cleanup_docker(cleanup_docker_func):
     try:
         cleanup_docker_func()
     except docker_errors.APIError as error:
-        logger.warning(f"Error occured during docker cleanup: {error}")
+        logger.warning(f"Error occurred during docker cleanup: {error}")
 
 
 def cleanup_docker_containers():
diff --git a/tests/functional/utils/log_monitor.py b/tests/functional/utils/log_monitor.py
@@ -27,6 +27,8 @@
 
 
 class LogMonitor(ABC):
+    # Optional callback invoked after save_to_file with (file_path, filename).
+    on_file_saved = None
 
     def __init__(self, **kwargs):
         self.context = None
@@ -102,6 +104,8 @@ def save_to_file(filename, logs):
         with open(file_path, "w", encoding="utf-8") as fd:
             for line in logs:
                 fd.write(f"{line}\n")
+        if LogMonitor.on_file_saved:
+            LogMonitor.on_file_saved(filename)
         return file_path
 
     def reset_to_logger_creation(self):
diff --git a/tests/functional/utils/ovms_testing_image/Dockerfile.ubuntu b/tests/functional/utils/ovms_testing_image/Dockerfile.ubuntu
@@ -1,23 +1,19 @@
 #
-# INTEL CONFIDENTIAL
-# Copyright (c) 2023-2025 Intel Corporation
+# Copyright (c) 2026 Intel Corporation
 #
-# The source code contained or described herein and all documents related to
-# the source code ("Material") are owned by Intel Corporation or its suppliers
-# or licensors. Title to the Material remains with Intel Corporation or its
-# suppliers and licensors. The Material contains trade secrets and proprietary
-# and confidential information of Intel or its suppliers and licensors. The
-# Material is protected by worldwide copyright and trade secret laws and treaty
-# provisions. No part of the Material may be used, copied, reproduced, modified,
-# published, uploaded, posted, transmitted, distributed, or disclosed in any way
-# without Intel's prior express written permission.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-# No license under any patent, copyright, trade secret or other intellectual
-# property right is granted to or conferred upon you by disclosure or delivery
-# of the Materials, either expressly, by implication, inducement, estoppel or
-# otherwise. Any license under such intellectual property rights must be express
-# and approved by Intel in writing.
+#      http://www.apache.org/licenses/LICENSE-2.0
 #
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ARG BASE_IMAGE=openvino/model_server:latest
 FROM $BASE_IMAGE as base_image
 
diff --git a/tests/functional/utils/ovms_testing_image/cpu_extensions/throw_exceptions/ThrowExceptions.cpp b/tests/functional/utils/ovms_testing_image/cpu_extensions/throw_exceptions/ThrowExceptions.cpp
@@ -33,7 +33,7 @@ class ThrowExceptions : public ov::op::Op {
         This extension was written against Resnet50-Binary model.
         Intention is to "hijack" all layers with type="Multiply" (Our method 'evaluate(...)' will be called instead).
         We use "Multiply" because it is first layer type that use input tensor values applied to model.
-        Whole purpose of this extension is to use insted "<layer id="2" ... >" from resnet50-binary-0001.xml:
+        Whole purpose of this extension is to use instead "<layer id="2" ... >" from resnet50-binary-0001.xml:
             <layer id="2" name="Mul_/Fused_Mul_" type="Multiply" version="opset1">
                 <input>
                         <port id="0"> ... </port>   // id="0" - input parameter layer.
diff --git a/tests/functional/utils/process.py b/tests/functional/utils/process.py
@@ -438,7 +438,7 @@ def get_pid_details_as_dict(pid):
             proc_status_dict[key.strip()] = ":".join(val).strip()   # If len(val) > 1 again join val into string.
         return proc_status_dict
     except FileNotFoundError:
-        pass    # Do not worry about it proc was killed definitly, most likely hazard during process killing
+        pass    # Do not worry about it proc was killed definitely, most likely hazard during process killing
     except Exception as exc:
         logger.exception(str(exc))
     return None
diff --git a/tests/functional/utils/reservation_manager/env_manager.py b/tests/functional/utils/reservation_manager/env_manager.py
@@ -90,7 +90,7 @@ def manage_reservation_environments(self):
 
             ports_prefixes += f"{str(slice_start)[:-2]} "
 
-            # Update environemnt but don't fail if no slice keys were provided
+            # Update environment but don't fail if no slice keys were provided
             self.update_env_for_slice(pool_part_slice, "start", slice_start)
             self.update_env_for_slice(pool_part_slice, "end", slice_stop)
             self.update_env_for_slice(pool_part_slice, "size", slice_size)
diff --git a/tests/functional/utils/reservation_manager/manager.py b/tests/functional/utils/reservation_manager/manager.py
@@ -112,7 +112,7 @@ def register_existing_reservations(self):
     def _create_reservation_file(self, reservation):
         """
         Create and save information about reservation file.
-        Concurently not safe.
+        Concurrently not safe.
         Exceptions:
         - pathlib.FileExistsError if file exists
         """
@@ -177,13 +177,13 @@ def get_available_reservation(self):
     def reserve_and_return(self):
         """
         Create reservation and return.
-        Concurently safe.
+        Concurrently safe.
         """
 
         logger.info("Locking reservation procedure")
         try:
             self.reservation_lock.acquire()
-            logger.info("Reservation lock aquired")
+            logger.info("Reservation lock acquired")
 
             logger.info("Attempting reservation")
             reservation = self.get_available_reservation()
@@ -588,16 +588,16 @@ def __str__(self):
     @staticmethod
     def validate_string(reservation):
         """Checks if string represents valid reservation"""
-        splitted = reservation.split("-")
+        elements = reservation.split("-")
 
-        assert len(splitted) == 4, (
+        assert len(elements) == 4, (
             "Reservation string should consist of 4 elements: "
-            "splitted with dash '-': "
+            "split with dash '-': "
             "'locks prefix', 'pool part start', "
             "'pool part stop', 'reserver identifier'")
 
-        pool_part_start_str = splitted[1]
-        pool_part_stop_str = splitted[2]
+        pool_part_start_str = elements[1]
+        pool_part_stop_str = elements[2]
 
         try:
             pool_part_start = int(pool_part_start_str)
diff --git a/tests/functional/utils/reservation_manager/runner.py b/tests/functional/utils/reservation_manager/runner.py
@@ -22,7 +22,7 @@
 
 class Runner:
     """
-    Manage running command, setup evironment variables
+    Manage running command, setup environment variables
     accoarding to Manager.Reservation instance.
     """
     def __init__(self, command, env_mgr):

Original file line number	Diff line number	Diff line change
`@@ -643,7 +643,7 @@ def __init__(self, docker_id, name, container_folder, rest_port, grpc_port, targ`
`643`	`643`	`)`
`644`	`644`
`645`	`645`	`def fetch_and_store_ovms_pid(self, timeout=60):`
`646`		`- self._dmesg_log.ovms_pid = None # Not implemetned yet`
	`646`	`+ self._dmesg_log.ovms_pid = None # Not implemented yet`
`647`	`647`
`648`	`648`	`def _create_logger(self):`
`649`	`649`	`return OvmsCmdLineDockerLogMonitor(self.docker_id)`