From f72e71903a51ec7be20b938a012ee512aa3c6c34 Mon Sep 17 00:00:00 2001 From: Mathieu Duponchelle Date: Fri, 19 Jul 2019 18:52:02 +0200 Subject: [PATCH] aggregator tests: fix seek event seqnums In https://gitlab.freedesktop.org/gstreamer/gstreamer/merge_requests/207, aggregator starts ignoring seek events with duplicate seqnums. We thus need to update the seqnum of events when reusing them multiple times. --- tests/check/elements/audiomixer.c | 4 ++++ tests/check/elements/compositor.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/tests/check/elements/audiomixer.c b/tests/check/elements/audiomixer.c index 8cab4c3448..ff3554b79c 100644 --- a/tests/check/elements/audiomixer.c +++ b/tests/check/elements/audiomixer.c @@ -389,6 +389,7 @@ test_play_twice_message_received (GstBus * bus, GstMessage * message, /* prepare playing again */ set_state_and_wait (bin, GST_STATE_PAUSED); + gst_event_set_seqnum (play_seek_event, gst_util_seqnum_next ()); res = gst_element_send_event (bin, gst_event_ref (play_seek_event)); fail_unless (res == TRUE, NULL); @@ -443,6 +444,7 @@ GST_START_TEST (test_play_twice) /* prepare playing */ set_state_and_wait (bin, GST_STATE_PAUSED); + gst_event_set_seqnum (play_seek_event, gst_util_seqnum_next ()); res = gst_element_send_event (bin, gst_event_ref (play_seek_event)); fail_unless (res == TRUE, NULL); @@ -505,6 +507,7 @@ GST_START_TEST (test_play_twice_then_add_and_play_again) /* prepare playing */ set_state_and_wait (bin, GST_STATE_PAUSED); + gst_event_set_seqnum (play_seek_event, gst_util_seqnum_next ()); res = gst_element_send_event (bin, gst_event_ref (play_seek_event)); fail_unless (res == TRUE, NULL); @@ -659,6 +662,7 @@ GST_START_TEST (test_live_seeking) /* prepare playing */ set_state_and_wait (bin, GST_STATE_PAUSED); + gst_event_set_seqnum (play_seek_event, gst_util_seqnum_next ()); res = gst_element_send_event (bin, gst_event_ref (play_seek_event)); fail_unless (res == TRUE, NULL); diff --git a/tests/check/elements/compositor.c b/tests/check/elements/compositor.c index 3aebf01b74..9e059de98d 100644 --- a/tests/check/elements/compositor.c +++ b/tests/check/elements/compositor.c @@ -663,6 +663,7 @@ test_play_twice_message_received (GstBus * bus, GstMessage * message, GST_CLOCK_TIME_NONE); ck_assert_int_ne (state_res, GST_STATE_CHANGE_FAILURE); + gst_event_set_seqnum (play_seek_event, gst_util_seqnum_next ()); res = gst_element_send_event (GST_ELEMENT (bin), gst_event_ref (play_seek_event)); fail_unless (res == TRUE, NULL); @@ -740,6 +741,7 @@ GST_START_TEST (test_play_twice) GST_CLOCK_TIME_NONE); ck_assert_int_ne (state_res, GST_STATE_CHANGE_FAILURE); + gst_event_set_seqnum (play_seek_event, gst_util_seqnum_next ()); res = gst_element_send_event (bin, gst_event_ref (play_seek_event)); fail_unless (res == TRUE, NULL); @@ -829,6 +831,7 @@ GST_START_TEST (test_play_twice_then_add_and_play_again) GST_CLOCK_TIME_NONE); ck_assert_int_ne (state_res, GST_STATE_CHANGE_FAILURE); + gst_event_set_seqnum (play_seek_event, gst_util_seqnum_next ()); res = gst_element_send_event (bin, gst_event_ref (play_seek_event)); fail_unless (res == TRUE, NULL);