code cleanup

Signed-off-by: Thien Trung Vuong <[email protected]>

Author: trungams

lisa/operating_system.py

@@ -589,8 +589,8 @@ def _get_version_info_from_named_regex_match(
         build_match = named_matches.group("build")
         log_message = (
             f"Found {package_name} version "
-            f"major:{major_match} minor:{minor_match} "  # noqa: E231
-            f"patch:{patch_match} build:{build_match}"  # noqa: E231
+            f"major:{major_match} minor:{minor_match} "
+            f"patch:{patch_match} build:{build_match}"
         )
         self._node.log.debug(log_message)
         return VersionInfo(major, minor, patch, build=build_match)
@@ -705,7 +705,7 @@ def __resolve_package_name(self, package: Union[str, Tool, Type[Tool]]) -> str:
         elif isinstance(package, Tool):
             package_name = package.package_name
         else:
-            assert isinstance(package, type), f"actual:{type(package)}"  # noqa: E231
+            assert isinstance(package, type), f"actual:{type(package)}"
             # Create a temp object, it doesn't query.
             # So they can be queried together.
             tool = package.create(self._node)
@@ -922,9 +922,7 @@ def add_azure_core_repo(
             code_name = self.information.codename
             repo_name = AzureCoreRepo.AzureCoreDebian
 
-        repo_url = (
-            f"http://packages.microsoft.com/repos/{repo_name.value}/"  # noqa: E231
-        )
+        repo_url = f"http://packages.microsoft.com/repos/{repo_name.value}/"
         self.add_repository(
             repo=(f"deb [arch={arch_name}] {repo_url} {code_name} main"),
             keys_location=keys,
@@ -1146,7 +1144,7 @@ def _package_exists(self, package: str) -> bool:
         # vim                                             deinstall
         # vim-common                                      install
         # auoms                                           hold
-        package_pattern = re.compile(f"{package}([ \t]+)(install|hold)")  # noqa: E201
+        package_pattern = re.compile(f"{package}([ \t]+)(install|hold)")
         if len(list(filter(package_pattern.match, result.stdout.splitlines()))) == 1:
             return True
         return False
@@ -1695,7 +1693,7 @@ def install_epel(self) -> None:
         ).is_greater_than_or_equal_to(7)
         epel_release_rpm_name = f"epel-release-latest-{major}.noarch.rpm"
         self.install_packages(
-            f"https://dl.fedoraproject.org/pub/epel/{epel_release_rpm_name}"  # noqa: E231
+            f"https://dl.fedoraproject.org/pub/epel/{epel_release_rpm_name}"
         )
 
         # replace $releasever to 8 for 8.x

lisa/tools/tpm2.py

@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT license.
 
-from typing import Dict, List, Sequence
+from typing import Dict, List, Optional, Sequence, Union
 
 from lisa.executable import Tool
 from lisa.operating_system import CBLMariner
@@ -27,16 +27,14 @@ def _install(self) -> bool:
         return self._check_exists()
 
     def pcrread(
-        self,
-        alg: str = "sha256",
-        pcrs: int | Sequence[int] | None = None,
+        self, alg: str = "sha256", pcrs: Optional[Union[int, Sequence[int]]] = None
     ) -> Dict[int, str]:
         pcrs = self._get_pcr_list(pcrs)
         if len(pcrs) == 0:
             pcrs_arg = "all"
         else:
             pcrs_arg = ",".join(map(str, pcrs))
-        cmd = f"pcrread {alg}:{pcrs_arg}"  # noqa: E231
+        cmd = f"pcrread {alg}:{pcrs_arg}"
         cmd_result = self.run(
             cmd,
             expected_exit_code=0,
@@ -61,7 +59,7 @@ def pcrread(
             result[pcr_index] = hash_value
         return result
 
-    def _get_pcr_list(self, pcrs: int | Sequence[int] | None) -> List[int]:
+    def _get_pcr_list(self, pcrs: Optional[Union[int, Sequence[int]]]) -> List[int]:
         if pcrs is None:
             return []
         if isinstance(pcrs, int):