imgtool: Unify File not found error messages

Signed-off-by: Rustam Ismayilov <rustam.ismayilov@arm.com>
Change-Id: I67e614811c31e786efebc05b9264611d6bb17edb

Author: rustammendel

scripts/imgtool/dumpinfo.py

@@ -140,7 +140,7 @@ def dump_imginfo(imgfile, outfile=None, silent=False):
             with open(imgfile, "rb") as f:
                 b = f.read()
     except FileNotFoundError:
-        raise click.UsageError("Image file not found ({})".format(imgfile))
+        raise click.UsageError(f"Image file not found: {imgfile}")
 
     # Parsing the image header
     _header = struct.unpack('IIHHIIBBHI', b[:28])

scripts/imgtool/image.py

@@ -349,7 +349,7 @@ def load(self, path):
                     self.infile_data = f.read()
                     self.payload = copy.copy(self.infile_data)
         except FileNotFoundError:
-            raise click.UsageError("Input file not found")
+            raise click.UsageError(f"Image file not found: {path}")
 
         # Add the image header if needed.
         if self.pad_header and self.header_size > 0:
@@ -840,7 +840,7 @@ def verify(imgfile, key):
                 with open(imgfile, 'rb') as f:
                     b = f.read()
         except FileNotFoundError:
-            raise click.UsageError(f"Image file {imgfile} not found")
+            raise click.UsageError(f"Image file not found: {imgfile}")
 
         magic, _, header_size, _, img_size = struct.unpack('IIHHI', b[:16])
         version = struct.unpack('BBHI', b[20:28])

scripts/imgtool/main.py

@@ -113,7 +113,7 @@ def load_key(keyfile):
     try:
         key = keys.load(keyfile)
     except FileNotFoundError as e:
-        print("Key File Not Found in the path: " + keyfile)
+        print(f"Key file not found: {keyfile}")
         raise e
     if key is not None:
         return key

scripts/tests/test_sign.py

@@ -1264,7 +1264,7 @@ def test_sign_hex_file_not_exists(self, key_type, tmp_path_persistent):
             ],
         )
         assert result.exit_code != 0
-        assert "Input file not found" in result.output
+        assert "Image file not found" in result.output
 
     @pytest.mark.parametrize("key_type", KEY_TYPES)
     def test_sign_hex_padded(self, key_type, tmp_path_persistent):

scripts/tests/test_verify.py

@@ -109,7 +109,7 @@ def test_verify_key_not_exists(self, key_type, tmp_path_persistent):
             ],
         )
         assert result.exit_code != 0
-        assert "File Not Found" in result.stdout
+        assert "Key file not found" in result.stdout
 
     @pytest.mark.parametrize("key_type", KEY_TYPES)
     def test_verify_image_not_exists(self, key_type, tmp_path_persistent):
@@ -127,7 +127,7 @@ def test_verify_image_not_exists(self, key_type, tmp_path_persistent):
             ],
         )
         assert result.exit_code != 0
-        assert "File Not Found" in result.stdout
+        assert "Image file not found" in result.stdout
 
     @pytest.mark.parametrize("key_type", ("rsa-3072",))
     def test_verify_key_inv_magic(self, key_type, tmp_path_persistent):