fix: Treat port number as integer

Signed-off-by: Nicolai Buchwitz <nb@tipi-net.de>

Author: nbuchwitz

tests/helper.py

@@ -37,8 +37,8 @@ def __stdout(self, prefix: str = "Current", port_filter: int = None):
     def __status(self, status: bool):
         if status:
             return "power"
-        else:
-            return "off"
+
+        return "off"
 
     def __power_status(self, port_number: int):
         assert port_number <= self.num_ports
@@ -80,13 +80,13 @@ def cmd(
             cmd += ["-p", str(port_number)]
 
         if new_status is not None:
-            self.status[port_number] = new_status
+            self.status[port_number - 1] = new_status
 
             cmd.append("-a")
             cmd.append(self.__status(new_status))
 
             stdout.append("Sent power on request".encode())
-            stdout += self.__stdout("New", port_filter=port_number)
+            stdout += self.__stdout("New", port_filter=port_number - 1)
 
         fp.register(cmd, stdout=stdout)
         fp.register(["uhubctl", "-v"], stdout="2.4.0-43-ge1e4d450")

tests/test_port.py

@@ -41,6 +41,9 @@ def test_wrong_or_missing_parameter(demo_hub: Hub):
 
 
 def test_port_status(mock_hub: MockHub, fp: pytest_subprocess.FakeProcess):
+    mock_hub.cmd(fp, n_arg=False)
+    mock_hub.discover_ports()
+
     for port in mock_hub.ports:
         mock_hub.cmd(fp, port.port_number)
         assert port.status is True

uhubctl/usb.py

@@ -142,7 +142,7 @@ def status(self) -> bool:
             reg = self.PORT_PATTERN.match(line)
 
             if reg:
-                if reg.group("port") != self.port_number:
+                if int(reg.group("port")) != self.port_number:
                     continue
                 status = "power" in reg.group("status")