Merge branch 'main' into opendal-comments

Author: NickCao

__templates__/driver/jumpstarter_driver/driver.py.tmpl

@@ -10,7 +10,8 @@ class ${DRIVER_CLASS}(Driver):
     some_other_config: int = 69
 
     def __post_init__(self):
-        super().__post_init__()
+        if hasattr(super(), "__post_init__"):
+            super().__post_init__()
         # some initialization here.
 
     @classmethod

packages/jumpstarter-driver-can/jumpstarter_driver_can/client.py

@@ -33,12 +33,13 @@ class CanClient(DriverClient, can.BusABC):
     """
 
     def __post_init__(self):
+        if hasattr(super(), "__post_init__"):
+            super().__post_init__()
+
         self._periodic_tasks: List[_SelfRemovingCyclicTask] = []
         self._filters = None
         self._is_shutdown: bool = False
 
-        super().__post_init__()
-
     @property
     @validate_call(validate_return=True)
     def state(self) -> can.BusState:

packages/jumpstarter-driver-can/jumpstarter_driver_can/driver.py

@@ -45,7 +45,9 @@ def client(cls) -> str:
         return "jumpstarter_driver_can.client.CanClient"
 
     def __post_init__(self):
-        super().__post_init__()
+        if hasattr(super(), "__post_init__"):
+            super().__post_init__()
+
         self.bus = can.Bus(channel=self.channel, interface=self.interface)
 
     @export
@@ -195,7 +197,9 @@ def client(cls) -> str:
         return "jumpstarter_driver_can.client.IsoTpClient"
 
     def __post_init__(self):
-        super().__post_init__()
+        if hasattr(super(), "__post_init__"):
+            super().__post_init__()
+
         self.bus = can.Bus(channel=self.channel, interface=self.interface)
         self.notifier = can.Notifier(self.bus, [])
         self.stack = isotp.NotifierBasedCanStack(

packages/jumpstarter-driver-dutlink/jumpstarter_driver_dutlink/conftest.py

@@ -0,0 +1,13 @@
+import pytest
+import usb
+
+
+def pytest_runtest_call(item):
+    try:
+        item.runtest()
+    except FileNotFoundError:
+        pytest.skip("dutlink not available")
+    except usb.core.USBError:
+        pytest.skip("USB not available")
+    except usb.core.NoBackendError:
+        pytest.skip("No USB backend")

packages/jumpstarter-driver-dutlink/jumpstarter_driver_dutlink/driver.py

@@ -29,6 +29,9 @@ class DutlinkConfig:
     tty: str | None = field(init=False, default=None)
 
     def __post_init__(self):
+        if hasattr(super(), "__post_init__"):
+            super().__post_init__()
+
         for dev in usb.core.find(idVendor=0x2B23, idProduct=0x1012, find_all=True):
             serial = usb.util.get_string(dev, dev.iSerialNumber)
             if serial == self.serial or self.serial is None:
@@ -80,15 +83,17 @@ def control(self, direction, ty, actions, action, value):
 
 
 @dataclass(kw_only=True)
-class DutlinkSerial(DutlinkConfig, PySerial):
-    url: str | None = field(init=False, default=None)
-
+class DutlinkSerialConfig(DutlinkConfig, Driver):
     def __post_init__(self):
-        super().__post_init__()
+        if hasattr(super(), "__post_init__"):
+            super().__post_init__()
 
         self.url = self.tty
 
-        super(PySerial, self).__post_init__()
+
+@dataclass(kw_only=True)
+class DutlinkSerial(PySerial, DutlinkSerialConfig):
+    url: str | None = field(init=False, default=None)
 
 
 @dataclass(kw_only=True)
@@ -247,7 +252,8 @@ class Dutlink(DutlinkConfig, CompositeInterface, Driver):
     """
 
     def __post_init__(self):
-        super().__post_init__()
+        if hasattr(super(), "__post_init__"):
+            super().__post_init__()
 
         self.children["power"] = DutlinkPower(serial=self.serial, timeout_s=self.timeout_s)
         self.children["storage"] = DutlinkStorageMux(

packages/jumpstarter-driver-dutlink/jumpstarter_driver_dutlink/driver_test.py

@@ -1,42 +1,64 @@
-import pytest
-import usb
+from time import sleep
+
 from jumpstarter_driver_network.adapters import PexpectAdapter
 
-from jumpstarter_driver_dutlink.driver import Dutlink
+from jumpstarter_driver_dutlink.driver import Dutlink, DutlinkPower, DutlinkSerial, DutlinkStorageMux
 
 from jumpstarter.common.utils import serve
 
+STORAGE_DEVICE = "/dev/null"  # MANUAL: replace with path to block device
 
-def test_drivers_dutlink():
-    try:
-        instance = Dutlink(
-            storage_device="/dev/null",
-        )
-    except FileNotFoundError:
-        pytest.skip("dutlink not available")
-    except usb.core.USBError:
-        pytest.skip("USB not available")
-    except usb.core.NoBackendError:
-        pytest.skip("No USB backend")
+
+def power_test(power):
+    power.on()  # MANUAL: led DUT_ON should be turned on
+    sleep(1)
+    assert next(power.read()).current != 0
+    power.off()  # MANUAL: led DUT_ON should be turned off
+
+
+def storage_test(storage):
+    storage.write_local_file("/dev/null")
+
+
+def serial_test(serial):
+    with PexpectAdapter(client=serial) as expect:
+        expect.send("\x02" * 5)
+
+        expect.send("about\r\n")
+        expect.expect("Jumpstarter test-harness")
+
+        expect.send("console\r\n")
+        expect.expect("Entering console mode")
+
+        expect.send("hello")
+        expect.expect("hello")
+
+
+def test_drivers_dutlink_power():
+    instance = DutlinkPower()
 
     with serve(instance) as client:
-        with PexpectAdapter(client=client.console) as expect:
-            expect.send("\x02" * 5)
+        power_test(client)
 
-            expect.send("about\r\n")
-            expect.expect("Jumpstarter test-harness")
 
-            expect.send("console\r\n")
-            expect.expect("Entering console mode")
+def test_drivers_dutlink_storage_mux():
+    instance = DutlinkStorageMux(storage_device=STORAGE_DEVICE)
 
-            client.power.off()
+    with serve(instance) as client:
+        storage_test(client)
 
-            client.storage.write_local_file("/dev/null")
-            client.storage.dut()
 
-            client.power.on()
+def test_drivers_dutlink_serial():
+    instance = DutlinkSerial()  # MANUAL: connect tx to rx
 
-            expect.send("\x02" * 5)
-            expect.expect("Exiting console mode")
+    with serve(instance) as client:
+        serial_test(client)
 
-            client.power.off()
+
+def test_drivers_dutlink():
+    instance = Dutlink(storage_device=STORAGE_DEVICE)
+
+    with serve(instance) as client:
+        power_test(client.power)
+        storage_test(client.storage)
+        serial_test(client.console)

packages/jumpstarter-driver-http/jumpstarter_driver_http/driver.py

@@ -29,7 +29,9 @@ class HttpServer(Driver):
     runner: Optional[web.AppRunner] = field(init=False, default=None)
 
     def __post_init__(self):
-        super().__post_init__()
+        if hasattr(super(), "__post_init__"):
+            super().__post_init__()
+
         os.makedirs(self.root_dir, exist_ok=True)
         self.app.router.add_routes(
             [

packages/jumpstarter-driver-pyserial/jumpstarter_driver_pyserial/driver.py

@@ -33,7 +33,9 @@ class PySerial(Driver):
     baudrate: int = field(default=115200)
 
     def __post_init__(self):
-        super().__post_init__()
+        if hasattr(super(), "__post_init__"):
+            super().__post_init__()
+
         self.device = serial_for_url(self.url, baudrate=self.baudrate)
 
     @classmethod

packages/jumpstarter-driver-raspberrypi/jumpstarter_driver_raspberrypi/driver.py

@@ -15,7 +15,8 @@ def client(cls) -> str:
         return "jumpstarter_driver_raspberrypi.client.DigitalOutputClient"
 
     def __post_init__(self):
-        super().__post_init__()
+        if hasattr(super(), "__post_init__"):
+            super().__post_init__()
         # Initialize as InputDevice first
         self.device = InputDevice(pin=self.pin)
 
@@ -49,7 +50,8 @@ def client(cls) -> str:
         return "jumpstarter_driver_raspberrypi.client.DigitalInputClient"
 
     def __post_init__(self):
-        super().__post_init__()
+        if hasattr(super(), "__post_init__"):
+            super().__post_init__()
         self.device = DigitalInputDevice(pin=self.pin)
 
     @export

packages/jumpstarter-driver-sdwire/jumpstarter_driver_sdwire/driver.py

@@ -22,7 +22,9 @@ class SDWire(StorageMuxInterface, Driver):
     storage_device: str | None = field(default=None)
 
     def __post_init__(self):
-        super().__post_init__()
+        if hasattr(super(), "__post_init__"):
+            super().__post_init__()
+
         for dev in usb.core.find(idVendor=0x04E8, idProduct=0x6001, find_all=True):
             if self.storage_device is None:
                 context = pyudev.Context()