rtnetlink: ensure tests pass when using noble's version of pyroute2

probert/tests/rtnetlink/test_addr.py

@@ -23,6 +23,10 @@
 
 class MyMockAddr(WithGetAttrMixin, MockAddress):
     """Subclass of pyroute2's MockAddr that makes it behave like a nlmsg"""
+    # MockAddress in pyroute2 0.9 has default values for index and address but
+    # the version in pyroute2 0.7.11 (noble) does not.
+    def __init__(self, index=0, address=None, *args, **kwargs) -> None:
+        super().__init__(index, address, *args, **kwargs)
 
 
 class TestAddrBuildEventData(unittest.TestCase):

probert/tests/rtnetlink/test_link.py

@@ -23,6 +23,10 @@
 
 class MyMockLink(WithGetAttrMixin, MockLink):
     """Subclass of pyroute2's MockLink that makes it behave like a nlmsg"""
+    # MockLink in pyroute2 0.9 has default values for index and ifname but
+    # the version in pyroute2 0.7.11 (noble) does not.
+    def __init__(self, index=0, ifname="", *args, **kwargs) -> None:
+        super().__init__(index, ifname, *args, **kwargs)
 
 
 class TestLinkBuildEventData(unittest.TestCase):

probert/tests/rtnetlink/test_listener.py

@@ -12,6 +12,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import importlib.metadata
 import socket
 import unittest
 from unittest import mock
@@ -201,8 +202,16 @@ def test_data_ready(self):
                 m_handle.mock_calls)
 
     def test_fileno(self):
-        # We need to patch the class, not the instance for some reason.
-        with mock.patch.object(IPRoute, "fileno", return_value=42):
+        version_str = importlib.metadata.version("pyroute2")
+        pyroute2_version = tuple(int(x) for x in version_str.split("."))
+
+        if pyroute2_version < (0, 9):
+            target = self.listener.ipr
+        else:
+            # We need to patch the class, not the instance for some reason.
+            target = IPRoute
+
+        with mock.patch.object(target, "fileno", return_value=42):
             self.assertEqual(42, self.listener.fileno())
 
     def test_set_link_flags(self):

probert/tests/rtnetlink/test_route.py

@@ -25,7 +25,9 @@
 class MyMockRoute(WithGetAttrMixin, MockRoute):
     """Subclass of pyroute2's MockRoute that makes it behave like a nlmsg...
        and works around a bug"""
-    def __init__(self, *args, **kwargs):
+    # MockRoute in pyroute2 0.9 has default values for dst and oif but the
+    # version in pyroute2 0.7.11 (noble) does not.
+    def __init__(self, dst=None, oif=0, *args, **kwargs) -> None:
         # Workaround ambiguity with route type.
         # See https://github.com/svinota/pyroute2/pull/1409
         if "type" in kwargs:
@@ -34,7 +36,8 @@ def __init__(self, *args, **kwargs):
             kwargs["type"] = kwargs["route_type"]
         else:
             kwargs["type"] = rtypes["RTN_UNICAST"]
-        super().__init__(*args, **kwargs)
+
+        super().__init__(dst, oif, *args, **kwargs)
 
 
 class TestGetIfindex(unittest.TestCase):