Mock pynput usage for Actions test run

Author: sjmf

kvm_serial/backend/mouse.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 import logging
-from pynput import mouse
+from pynput.mouse import Button, Listener
 from serial import Serial
 from screeninfo import get_monitors
 
@@ -11,7 +11,7 @@
 
 class MouseListener:
     def __init__(self, serial, block=True):
-        self.listener = mouse.Listener(
+        self.listener = Listener(
             on_move=self.on_move,
             on_click=self.on_click,
             on_scroll=self.on_scroll,
@@ -22,9 +22,9 @@ def __init__(self, serial, block=True):
         # Mouse movement control character
         self.control_chars = {
             "NU": b"\x00",  # Release
-            mouse.Button.left: b"\x01",  # Left click
-            mouse.Button.right: b"\x02",  # Right click
-            mouse.Button.middle: b"\x04",  # Centre Click
+            Button.left: b"\x01",  # Left click
+            Button.right: b"\x02",  # Right click
+            Button.middle: b"\x04",  # Centre Click
         }
 
         # Get screen dimensions
@@ -68,7 +68,7 @@ def on_move(self, x, y):
 
         return True
 
-    def on_click(self, x, y, button: mouse.Button, down):
+    def on_click(self, x, y, button: Button, down):
         data = bytearray(b"\x01")  # Relative coordinates (0x01)
         data += self.control_chars[button] if down else b"\x00"  # Mouse button
         data += b"\x00\x00"  # Rel. mouse position x/y coordinate (2 bytes 0x0)

tests/backend/implementations/test_pynputop.py

@@ -1,12 +1,16 @@
-from unittest.mock import patch
+from unittest.mock import patch, MagicMock
 
 from kvm_serial.backend.implementations.pynputop import PynputOp
 from tests._utilities import MockSerial, mock_serial
 
 
+# Mock the entire pynput.keyboard module
+@patch("kvm_serial.backend.implementations.pynputop.Key")
+@patch("kvm_serial.backend.implementations.pynputop.KeyCode")
+@patch("kvm_serial.backend.implementations.pynputop.Listener")
+@patch("serial.Serial", MockSerial)
 class TestPynputOperation:
-    @patch("serial.Serial", MockSerial)
-    def test_name_property(self, mock_serial):
+    def test_name_property(self, mock_serial, mock_listener, mock_keycode):
         """Test that the name property returns 'pynput'"""
         op = PynputOp(mock_serial)
         assert op.name == "pynput"

tests/backend/test_mouse.py

@@ -4,9 +4,11 @@
 
 
 class TestMouse:
+    @patch("kvm_serial.backend.mouse.Button")
+    @patch("kvm_serial.backend.mouse.Listener")
     @patch("serial.Serial", MockSerial)
     @patch("kvm_serial.backend.mouse.DataComm")
-    def test_mouse_listener(self, mock_datacomm, mock_serial):
+    def test_mouse_listener(self, mock_datacomm, mock_serial, mock_button):
         """Test basic MouseListener initialization"""
         # Ensure DataComm mock is properly configured
         mock_datacomm.return_value = MagicMock()