tests: allow passing config as a fixture

mctpd now requests a config fixture, which is None by default to ensure
previous behaviour.

Test authors can now override the config using pytest fixtures
overriding facility. An example on overriding per file basis is
included in the commit.

Signed-off-by: Khang D Nguyen <[email protected]>

Author: khangng-ampere

tests/conftest.py

@@ -21,8 +21,12 @@ async def dbus():
         yield bus
 
 @pytest.fixture
-async def mctpd(nursery, dbus, sysnet):
-    m = fake_mctpd.MctpdWrapper(dbus, sysnet)
+def config():
+    return None
+
+@pytest.fixture
+async def mctpd(nursery, dbus, sysnet, config):
+    m = fake_mctpd.MctpdWrapper(dbus, sysnet, config = config)
     await m.start_mctpd(nursery)
     yield m
     res = await m.stop_mctpd()

tests/mctp_test_utils.py

@@ -6,6 +6,13 @@ async def mctpd_mctp_iface_obj(dbus, iface):
         )
     return await obj.get_interface('au.com.codeconstruct.MCTP.BusOwner1')
 
+async def mctpd_mctp_iface_control_obj(dbus, iface):
+    obj = await dbus.get_proxy_object(
+            "au.com.codeconstruct.MCTP1",
+            "/au/com/codeconstruct/mctp1/interfaces/" + iface.name,
+        )
+    return await obj.get_interface("au.com.codeconstruct.MCTP.Interface1")
+
 async def mctpd_mctp_endpoint_obj(dbus, path, iface):
     obj = await dbus.get_proxy_object(
             'au.com.codeconstruct.MCTP1',

tests/mctpd/__init__.py

@@ -6,6 +6,7 @@
 import socket
 import struct
 import sys
+import tempfile
 import trio
 import uuid
 
@@ -975,11 +976,12 @@ async def send_fd(sock, fd):
 
 
 class MctpdWrapper:
-    def __init__(self, bus, sysnet, binary=None):
+    def __init__(self, bus, sysnet, binary=None, config=None):
         self.bus = bus
         self.system = sysnet.system
         self.network = sysnet.network
         self.binary = binary or './test-mctpd'
+        self.config = config
         (self.sock_local, self.sock_remote) = self.socketpair()
 
     def socketpair(self):
@@ -1056,8 +1058,18 @@ def name_owner_changed(name, new_owner, old_owner):
         # start mctpd, passing our control socket
         env = os.environ.copy()
         env['MCTP_TEST_SOCK'] = str(self.sock_remote.fileno())
+
+        if self.config:
+            config_file = tempfile.NamedTemporaryFile('w', prefix="mctp.conf.")
+            config_file.write(self.config)
+            config_file.flush()
+            command = [self.binary, '-v', '-c', config_file.name]
+        else:
+            config_file = None
+            command = [self.binary, '-v']
+
         proc = await trio.lowlevel.open_process(
-                [self.binary, '-v'], # todo: flexible paths
+                command = command,
                 pass_fds = (1, 2, self.sock_remote.fileno()),
                 env = env,
             )
@@ -1074,6 +1086,9 @@ def name_owner_changed(name, new_owner, old_owner):
 
         proc_rc = await proc.wait()
 
+        if config_file:
+            config_file.close()
+
         await send_chan.send(proc_rc)
 
 Sysnet = namedtuple('SysNet', ['system', 'network'])

tests/test_mctpd_endpoint.py

@@ -0,0 +1,15 @@
+import pytest
+from mctp_test_utils import *
+from mctpd import *
+
+@pytest.fixture(name="config")
+def endpoint_config():
+    return """
+    mode = "endpoint"
+    """
+
+""" Test if mctpd is running as an endpoint """
+async def test_endpoint_role(dbus, mctpd):
+    obj = await mctpd_mctp_iface_control_obj(dbus, mctpd.system.interfaces[0])
+    role = await obj.get_role()
+    assert str(role) == "Endpoint"