Cleanup tests and unused variables to make automated checks happy

canonical · Sep 24, 2024 · 8af1477 · 8af1477
1 parent cc45b31
commit 8af1477
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/providers/base/bin/wifi_nmcli_test.py b/providers/base/bin/wifi_nmcli_test.py
@@ -391,7 +391,7 @@ def main():
         turn_down_nm_connections()
         try:
             args.func(args)
-        except Exception as e:
+        except Exception:
             # The test is not required to run as root, but root access is
             # required for journal access so only attempt to print when e.g.
             # running under Remote

diff --git a/providers/base/tests/test_wifi_nmcli_test.py b/providers/base/tests/test_wifi_nmcli_test.py
@@ -278,7 +278,7 @@ class TestWaitForConnected(unittest.TestCase):
         "wifi_nmcli_test.sp.check_output",
         MagicMock(
             side_effect=[
-                b"100:connected\nTestESSID",
+                "100:connected\nTestESSID\n",
             ]
         ),
     )
@@ -289,7 +289,7 @@ def test_wait_for_connected_success(self):
 
     @patch(
         "wifi_nmcli_test.sp.check_output",
-        MagicMock(return_value=b"30:disconnected\nTestESSID"),
+        MagicMock(return_value="30:disconnected\nTestESSID\n"),
     )
     @patch("wifi_nmcli_test.print_cmd", new=MagicMock())
     def test_wait_for_connected_failure_due_to_timeout(self):
@@ -300,7 +300,7 @@ def test_wait_for_connected_failure_due_to_timeout(self):
 
     @patch(
         "wifi_nmcli_test.sp.check_output",
-        MagicMock(return_value=b"100:connected\nWrongESSID"),
+        MagicMock(return_value="100:connected\nWrongESSID\n"),
     )
     @patch("wifi_nmcli_test.print_cmd", new=MagicMock())
     def test_wait_for_connected_failure_due_to_essid_mismatch(self):