Unittest cleanup and enhancement

Author: a-kleinf

tests/mockstuff.py

@@ -76,7 +76,13 @@ class TestDevSubscription(BicepsSubscription):
     expires = 60
     notify_ref = 'a ref string'
 
-    def __init__(self, filter_: list[str], soap_client_pool: SoapClientPool, msg_factory: MessageFactory):
+    def __init__(
+        self,
+        filter_: list[str],
+        soap_client_pool: SoapClientPool,
+        msg_factory: MessageFactory,
+        test_nbr_reports: int = 1,
+    ):
         notify_ref_node = etree.Element(ns_hlp.WSE.tag('References'))
         ident_node = etree.SubElement(notify_ref_node, ns_hlp.WSE.tag('Identifier'))
         ident_node.text = self.notify_ref
@@ -100,6 +106,8 @@ def __init__(self, filter_: list[str], soap_client_pool: SoapClientPool, msg_fac
             log_prefix='test',
         )
         self.reports = []
+        self._test_nbr_reports = test_nbr_reports
+        self.reports_event = threading.Event()
 
     def send_notification_report(self, body_node: LxmlElement, action: str):
         """Send notification to subscriber."""
@@ -110,6 +118,8 @@ def send_notification_report(self, body_node: LxmlElement, action: str):
         )
         message = self._mk_notification_message(info_block, body_node)
         self.reports.append(message)
+        if len(self.reports) >= self._test_nbr_reports:
+            self.reports_event.set()
 
     async def async_send_notification_report(self, body_node: LxmlElement, action: str):
         """Send notification to subscriber."""
@@ -120,6 +130,8 @@ async def async_send_notification_report(self, body_node: LxmlElement, action: s
         )
         message = self._mk_notification_message(info_block, body_node)
         self.reports.append(message)
+        if len(self.reports) >= self._test_nbr_reports:
+            self.reports_event.set()
 
     async def async_send_notification_end_message(
         self,
@@ -135,7 +147,7 @@ async def async_send_notification_end_message(
 class SomeDevice(SdcProvider):
     """A device used for unit tests. Some values are predefined."""
 
-    def __init__(  # noqa: PLR0913
+    def __init__(  # noqa: PLR0913, PLR0917
         self,
         wsdiscovery: WsDiscoveryProtocol,
         mdib_xml_data: bytes,
@@ -189,7 +201,7 @@ def __init__(  # noqa: PLR0913
         )
 
     @classmethod
-    def from_mdib_file(  # noqa: PLR0913
+    def from_mdib_file(  # noqa: PLR0913, PLR0917
         cls,
         wsdiscovery: WsDiscoveryProtocol,
         epr: str | uuid.UUID | None,

tests/test_device_subscriptions.py

@@ -2,7 +2,6 @@
 
 import pathlib
 import re
-import time
 import unittest
 from decimal import Decimal
 
@@ -90,6 +89,7 @@ def test_waveform_subscription(self):
             [self.sdc_device.mdib.sdc_definitions.Actions.Waveform],
             self.sdc_device._soap_client_pool,
             self.sdc_device.msg_factory,
+            test_nbr_reports=21,
         )
         mgr = self.sdc_device.hosted_services.state_event_service.hosting_service.subscriptions_manager
 
@@ -105,7 +105,7 @@ def test_waveform_subscription(self):
         waveform_provider.register_waveform_generator(HANDLES[1], st)
         waveform_provider.register_waveform_generator(HANDLES[2], si)
 
-        time.sleep(3)
+        self.assertTrue(test_subscription.reports_event.wait(timeout=10))
         self.assertGreater(len(test_subscription.reports), 20)
         report = test_subscription.reports[-1]
         self._verify_proper_namespaces(report)

tests/test_device_waveform.py

@@ -94,11 +94,12 @@ def test_waveform_subscription(self):
             [self.sdc_device.mdib.sdc_definitions.Actions.Waveform],
             self._soap_client_pool,
             self.sdc_device.msg_factory,
+            test_nbr_reports=11,
         )
         mgr = self.sdc_device.hosted_services.state_event_service.hosting_service.subscriptions_manager
         mgr._subscriptions.add_object(test_subscription)
 
-        time.sleep(3)
+        self.assertTrue(test_subscription.reports_event.wait(timeout=10))
         self.assertGreater(len(test_subscription.reports), 10)
 
     def _mk_device(self):