test-dds-md-syncer remove check for intervined callbacks

OhadMeir · Jan 19, 2025 · 7213441 · 7213441
1 parent 11c15bc
commit 7213441
Showing 1 changed file with 30 additions and 11 deletions.
diff --git a/unit-tests/dds/test-md-syncer.py b/unit-tests/dds/test-md-syncer.py
@@ -343,18 +343,37 @@ def md_thread():
 
 with test.closure( 'Two threads, slow callback -> different callbacks intervined' ):
     """
-    Test correct handling of this scenario: (incorrect handling can trigger an exception)
-    Thread A enqueues frame0
-    Thread A enqueues frame1
-    Thread B enqueues metadata1
-        hadndle_frame_without_metadata( frame0 ) calls user callback in thread B context
-    while the callback is handled thread A enqueues frame2
-        handle_match( frame1, metadata1 ) calls user callback in thread A context
+    Test correct handling of intervined callbacks (incorrect handling can trigger an exception)
+    Based on machine and scheduler several scenarios that test this can happen:
+    Scenario 1:
+        Thread A enqueues frame0
+        Thread A enqueues frame1
+        Thread B enqueues metadata1
+            hadndle_frame_without_metadata( frame0 ) calls user callback in thread B context
+        while the callback is handled thread A enqueues frame2
+            handle_match( frame1, metadata1 ) calls user callback in thread A context
+    Scenario 2:
+        Thread A enqueues frame0
+        Thread B enqueues metadata1
+            hadndle_frame_without_metadata( frame0 ) calls user callback in thread B context
+        while the callback is handled thread A enqueues frame1
+            handle_match( frame1, metadata1 ) calls user callback in thread A context
+        Thread A enqueues frame2
+    Scenario 3:
+        Thread A enqueues frame0
+        Thread A enqueues frame1
+        Thread A enqueues frame2
+            hadndle_frame_without_metadata( frame0 ) calls user callback in thread A context
+        while the callback is handled thread B enqueues metadata1
+            handle_match( frame1, metadata1 ) calls user callback in thread B context
     """
 
     def frame_callback( image, metadata ):
-        on_frame_ready( image, metadata )  # for reporting
-        sleep( 0.2 )
+        # Not using on_frame_ready function to avoid last_image < image_id check defined there.
+        # There is a small chance that frame1 will be appended to received_frames before frame0.
+        log.d( f'{image_id(image):-<4}> {dds.now()} [{threading.get_native_id()}] frame ready: {image=} {metadata=}' )
+        received_frames.append( frame( image, metadata ))
+        sleep( 0.1 )
         log.d( f'<{image_id(image):->4} {dds.now()} [{threading.get_native_id()}]' )
 
     syncer = new_syncer( on_frame_ready=frame_callback )
@@ -366,11 +385,11 @@ def frame_thread():
             idstr = f'i{image_id(image)}'
             log.d( f'{idstr:>5} {dds.now()} [{threadid}] enqueue {image}' )
             syncer.enqueue_frame( i, image )
-            sleep( 0.1 )
+            sleep( 0.05 )
 
     threadA = threading.Thread( target=frame_thread )
     threadA.start()
-    sleep( 0.22 ) # Between 2nd and 3rd enqueue_frame
+    sleep( 0.12 ) # Between 2nd and 3rd enqueue_frame
     md = new_metadata( 1, time_stamp( 1 ) )
     syncer.enqueue_metadata( 1, md )
     threadA.join()