From b1f1d96d96c79afbb7288db949f6ecf15d7970c5 Mon Sep 17 00:00:00 2001
From: Avram Lubkin <avramlubkin@microsoft.com>
Date: Wed, 4 Jan 2023 09:49:47 -0500
Subject: [PATCH] Pylint: Enable variable checks

---
 lisa/sut_orchestrator/aws/features.py   | 9 +++------
 lisa/sut_orchestrator/azure/features.py | 9 +++------
 lisa/tools/tar.py                       | 2 +-
 pylintrc                                | 3 ---
 selftests/test_environment.py           | 4 ++--
 5 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/lisa/sut_orchestrator/aws/features.py b/lisa/sut_orchestrator/aws/features.py
index f5de780188..5921f8e63d 100644
--- a/lisa/sut_orchestrator/aws/features.py
+++ b/lisa/sut_orchestrator/aws/features.py
@@ -158,14 +158,11 @@ def _initialize(self, *args: Any, **kwargs: Any) -> None:
         self._initialize_information(self._node)
 
     def _get_primary(self, nics: List[Any]) -> Any:
-        found_primary = False
         for nic in nics:
             if nic["Attachment"]["DeviceIndex"] == 0:
-                found_primary = True
-                break
-        if not found_primary:
-            raise LisaException(f"fail to find primary nic for vm {self._node.name}")
-        return nic
+                return nic
+
+        raise LisaException(f"failed to find primary nic for vm {self._node.name}")
 
     def switch_sriov(
         self, enable: bool, wait: bool = True, reset_connections: bool = True
diff --git a/lisa/sut_orchestrator/azure/features.py b/lisa/sut_orchestrator/azure/features.py
index 8e2b90d5a3..26b97d2f31 100644
--- a/lisa/sut_orchestrator/azure/features.py
+++ b/lisa/sut_orchestrator/azure/features.py
@@ -793,14 +793,11 @@ def _check_sriov_enabled(
     def _get_primary(
         self, nics: List[NetworkInterfaceReference]
     ) -> NetworkInterfaceReference:
-        found_primary = False
         for nic in nics:
             if nic.primary:
-                found_primary = True
-                break
-        if not found_primary:
-            raise LisaException(f"fail to find primary nic for vm {self._node.name}")
-        return nic
+                return nic
+
+        raise LisaException(f"failed to find primary nic for vm {self._node.name}")
 
     def _get_all_nics(self) -> Any:
         azure_platform: AzurePlatform = self._platform  # type: ignore
diff --git a/lisa/tools/tar.py b/lisa/tools/tar.py
index 019330cb02..0047339771 100644
--- a/lisa/tools/tar.py
+++ b/lisa/tools/tar.py
@@ -91,7 +91,7 @@ def is_top_level(tar_content: str) -> bool:
         # if we need to test anything, add inputs that pass all tests
         if filters:
             for item in content:
-                if all(map(lambda x: x(item), filters)):  # noqa: B023
+                if all(func(item) for func in filters):
                     output.append(item)
             return output
         else:
diff --git a/pylintrc b/pylintrc
index 66386aa158..50a385d34f 100644
--- a/pylintrc
+++ b/pylintrc
@@ -33,7 +33,6 @@ disable=
     # Potential bugs
     abstract-method,
     broad-except,
-    cell-var-from-loop,
     cyclic-import,
     eval-used,
     expression-not-assigned,
@@ -52,10 +51,8 @@ disable=
     redefined-outer-name,
     super-init-not-called,
     unbalanced-tuple-unpacking,
-    undefined-loop-variable,
     unspecified-encoding,
     unsubscriptable-object,
-    used-before-assignment,
 
     # Syntax / Logic
     chained-comparison,
diff --git a/selftests/test_environment.py b/selftests/test_environment.py
index ec53074789..b540ff837d 100644
--- a/selftests/test_environment.py
+++ b/selftests/test_environment.py
@@ -222,9 +222,9 @@ def test_create_from_runbook_cap(self) -> None:
         for n in env.nodes.list():
             # mock initializing
             n._is_initialized = True
-        self.assertEqual(search_space.IntRange(min=4), n.capability.core_count)
+            self.assertEqual(search_space.IntRange(min=4), n.capability.core_count)
+            self.assertIsNone(n.capability.disk)
 
-        self.assertIsNone(n.capability.disk)
         # check from env capability
         env_cap = env.capability
         self.assertEqual(1, len(env_cap.nodes))