test(MOCKS): simplify patched mocks

Author: niall-byrne

pi_portal/modules/configuration/tests/test_user_config.py

@@ -58,9 +58,9 @@ def setUp(self) -> None:
 
   @mock.patch(
       json_file.__name__ + ".JSONFileReader.load_json_file",
-      return_value=MOCK_JSON
+      mock.Mock(return_value=MOCK_JSON)
   )
-  def test_load(self, _: mock.Mock) -> None:
+  def test_load(self) -> None:
     with mock.patch.object(self.configuration, 'validate') as m_validate:
       self.configuration.load()
       self.assertEqual(self.configuration.user_config, MOCK_JSON)

pi_portal/modules/integrations/gpio/components/bases/tests/test_monitor.py

@@ -30,8 +30,8 @@ def setUpClass(cls) -> None:
     cls.test_class = concrete_monitor.ConcreteGPIOMonitor
 
   @gpio_loop.patch_gpio_loop(monitor.__name__ + ".GPIOMonitorBase")
-  @mock.patch(monitor.__name__ + ".RPi.GPIO")
-  def test_loop_no_change(self, _: mock.Mock) -> None:
+  @mock.patch(monitor.__name__ + ".RPi.GPIO", mock.Mock())
+  def test_loop_no_change(self) -> None:
 
     with gpio_change.patch_gpio_input_change(self.instance.gpio_pins, False):
       mock_logger_message = "No New Messages"
@@ -46,8 +46,8 @@ def test_loop_no_change(self, _: mock.Mock) -> None:
       )
 
   @gpio_loop.patch_gpio_loop(monitor.__name__ + ".GPIOMonitorBase")
-  @mock.patch(monitor.__name__ + ".RPi.GPIO")
-  def test_loop_when_logging_all_states(self, _: mock.Mock) -> None:
+  @mock.patch(monitor.__name__ + ".RPi.GPIO", mock.Mock())
+  def test_loop_when_logging_all_states(self) -> None:
     self.instance.gpio_log_changes_only = False
     with gpio_change.patch_gpio_input_change(self.instance.gpio_pins, False):
       mock_logger_message = "No New Messages"
@@ -71,8 +71,8 @@ def test_loop_when_logging_all_states(self, _: mock.Mock) -> None:
       )
 
   @gpio_loop.patch_gpio_loop(monitor.__name__ + ".GPIOMonitorBase")
-  @mock.patch(monitor.__name__ + ".RPi.GPIO")
-  def test_loop_with_change(self, _: mock.Mock) -> None:
+  @mock.patch(monitor.__name__ + ".RPi.GPIO", mock.Mock())
+  def test_loop_with_change(self) -> None:
 
     with gpio_change.patch_gpio_input_change(self.instance.gpio_pins, True):
       mock_logger_message = "No New Messages"

pi_portal/modules/integrations/gpio/tests/test_shim.py

@@ -64,16 +64,22 @@ def test_import_or_mock_arm(self) -> None:
     self.assertIsInstance(shim.import_or_mock("adafruit_dht"), ModuleType)
 
   @mock.patch(shim.__name__ + ".os.uname", MOCK_ARM)
-  @mock.patch(shim.__name__ + ".import_module", side_effect=NotImplementedError)
-  def test_import_or_mock_arm_exception(self, _: mock.Mock) -> None:
+  @mock.patch(
+      shim.__name__ + ".import_module",
+      mock.Mock(side_effect=NotImplementedError)
+  )
+  def test_import_or_mock_arm_exception(self) -> None:
     self.assertIsInstance(
         shim.import_or_mock("board"),
         mock.MagicMock,
     )
 
   @mock.patch(shim.__name__ + ".os.uname", MOCK_ARM)
-  @mock.patch(shim.__name__ + ".import_module", side_effect=NotImplementedError)
-  def test_import_or_mock_arm_exception_dual_import(self, _: mock.Mock) -> None:
+  @mock.patch(
+      shim.__name__ + ".import_module",
+      mock.Mock(side_effect=NotImplementedError)
+  )
+  def test_import_or_mock_arm_exception_dual_import(self) -> None:
     first_import = shim.import_or_mock("board")
     second_import = shim.import_or_mock("board")