commit db0e453f88636f957df61f0f360e13140e40eb0b
author Simon Glass <sjg@chromium.org> Sun Feb 09 09:07:16 2025 -0700
committer Simon Glass <sjg@chromium.org> Sat Mar 15 11:02:04 2025 +0000
tree 6248a494ab3d0ba11f0834abb1cab9fba6db5456
parent fb916374a61209ef9c96a5dd0a844d2a68afda6d

test/py: Drop importing utils as util

Now that we have a shorter name, we don't need this sort of thing.
Drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> # test_android

test/py/tests/test_fit_auto_signed.py

diff --git a/test/py/tests/test_fit_auto_signed.py b/test/py/tests/test_fit_auto_signed.py
index bee93e4..b5f872f 100644
--- a/test/py/tests/test_fit_auto_signed.py
+++ b/test/py/tests/test_fit_auto_signed.py
@@ -17,7 +17,7 @@
 
 import os
 import pytest
-import utils as util
+import utils
 import binascii
 from Cryptodome.Hash import SHA1
 from Cryptodome.Hash import SHA256
@@ -33,15 +33,15 @@
         self.confgs_nodes = set()
 
     def __fdt_list(self, path):
-        return util.run_and_log(self.cons,
+        return utils.run_and_log(self.cons,
             f'fdtget -l {self.fit} {path}')
 
     def __fdt_get_string(self, node, prop):
-        return util.run_and_log(self.cons,
+        return utils.run_and_log(self.cons,
             f'fdtget -ts {self.fit} {node} {prop}')
 
     def __fdt_get_binary(self, node, prop):
-        numbers = util.run_and_log(self.cons,
+        numbers = utils.run_and_log(self.cons,
             f'fdtget -tbi {self.fit} {node} {prop}')
 
         bignum = bytearray()
@@ -166,7 +166,7 @@
     s_args = " -k" + tempdir + " -g" + key_name + " -o" + sign_algo
 
     # 1 - Create auto FIT with images crc32 checksum, and verify it
-    util.run_and_log(cons, mkimage + ' -fauto' + b_args + " " + fit_file)
+    utils.run_and_log(cons, mkimage + ' -fauto' + b_args + " " + fit_file)
 
     fit = SignedFitHelper(cons, fit_file)
     if fit.build_nodes_sets() == 0:
@@ -175,8 +175,8 @@
     fit.check_fit_crc32_images()
 
     # 2 - Create auto FIT with signed images, and verify it
-    util.run_and_log(cons, mkimage + ' -fauto' + b_args + s_args + " " +
-        fit_file)
+    utils.run_and_log(cons, mkimage + ' -fauto' + b_args + s_args + " " +
+                      fit_file)
 
     fit = SignedFitHelper(cons, fit_file)
     if fit.build_nodes_sets() == 0:
@@ -185,8 +185,8 @@
     fit.check_fit_signed_images(key_name, sign_algo, verifier)
 
     # 3 - Create auto FIT with signed configs and hashed images, and verify it
-    util.run_and_log(cons, mkimage + ' -fauto-conf' + b_args + s_args + " " +
-        fit_file)
+    utils.run_and_log(cons, mkimage + ' -fauto-conf' + b_args + s_args + " " +
+                      fit_file)
 
     fit = SignedFitHelper(cons, fit_file)
     if fit.build_nodes_sets() == 0: