kleaf: Replace os.path usage with Path() objects

Replace the usage of the os.path.* methods with Path()
objects in the initramfs_modules_lists_test.py file to
conform to more modern python practices. Also, include
more style fixes.

Bug: 323710246
Signed-off-by: Isaac J. Manjarres <isaacmanjarres@google.com>
(cherry picked from https://android-review.googlesource.com/q/commit:d7a39fe1a99e6c78cb3e5e57c9e742f46f35a611)
Merged-In: Ib92fc6bc3a41186f21925a45f8d53e0b5f349803
Change-Id: Ib92fc6bc3a41186f21925a45f8d53e0b5f349803

1 files changed, 13 insertions, 11 deletions

diff --git a/kleaf/artifact_tests/initramfs_modules_lists_test.py b/kleaf/artifact_tests/initramfs_modules_lists_test.py
index 4f7f4e2a..99770339 100644
--- a/kleaf/artifact_tests/initramfs_modules_lists_test.py
+++ b/kleaf/artifact_tests/initramfs_modules_lists_test.py
@@ -13,7 +13,6 @@
 # limitations under the License.
 
 import argparse
-import os
 import subprocess
 import sys
 import tempfile
@@ -96,17 +95,19 @@ class InitramfsModulesLists(unittest.TestCase):
             modules_dir:       directory that contains the modules.load* files
         """
         for modules_load, expected_modules_list_path in modules_lists_map.items():
-            modules_load_path = os.path.join(modules_dir, modules_load)
-            self.assertTrue(os.path.isfile(modules_load_path), f"Can't find {modules_load_path}")
+            modules_load_path = pathlib.Path(modules_dir, modules_load)
+            self.assertTrue(modules_load_path.is_file(), f"Can't find {modules_load_path}")
 
             with open(modules_load_path) as modules_load_file, \
                  open(expected_modules_list_path) as expected_modules_list_file:
-                modules_load_lines = [os.path.basename(line).strip() for line in modules_load_file]
+                modules_load_lines = [pathlib.Path(line.strip()).name for line in modules_load_file]
                 expected_modules_list_lines = [line.strip() for line in expected_modules_list_file]
                 self.assertCountEqual(modules_load_lines, expected_modules_list_lines)
 
     def test_diff(self):
-        initramfs_list = [f for f in arguments.files if os.path.basename(f) == "initramfs.img"]
+        initramfs_list = [file
+                          for file in arguments.files
+                          if pathlib.Path(file).name == "initramfs.img"]
         self.assertEqual(len(initramfs_list), 1)
         initramfs = initramfs_list[0]
         modules_lists_map = {}
@@ -123,12 +124,11 @@ class InitramfsModulesLists(unittest.TestCase):
         with tempfile.TemporaryDirectory() as temp_dir:
             self._decompress_initramfs(initramfs, temp_dir)
 
-            lib_modules = os.path.join(temp_dir, "lib/modules")
-            self.assertTrue(os.path.isdir(lib_modules))
+            lib_modules = pathlib.Path(temp_dir, "lib/modules")
+            self.assertTrue(lib_modules.is_dir())
 
-            kernel_versions = os.listdir(lib_modules)
-            for v in kernel_versions:
-                modules_dir = os.path.join(lib_modules, v)
+            for kernel_version in lib_modules.iterdir():
+                modules_dir = pathlib.Path(lib_modules, kernel_version)
                 self._diff_modules_lists(modules_lists_map, modules_dir)
 
     def _verify_modules_load_lists(self, modules_list_name, vendor_boot_name, image_files):
@@ -148,7 +148,9 @@ class InitramfsModulesLists(unittest.TestCase):
             modules_load_lists.append(f"{vendor_boot_name}.{modules_list_name}")
 
         modules_load_list_re = re.compile(f".*{modules_list_name}$")
-        modules_load_list_matches = [os.path.basename(f) for f in image_files if modules_load_list_re.fullmatch(os.path.basename(f))]
+        modules_load_list_matches = [pathlib.Path(file).name
+                                     for file in image_files
+                                     if modules_load_list_re.fullmatch(pathlib.Path(file).name)]
 
         self.assertCountEqual(modules_load_lists, modules_load_list_matches)