summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThibault Saunier <tsaunier@gnome.org>2014-05-06 09:37:31 +0200
committerThibault Saunier <tsaunier@gnome.org>2014-05-06 09:37:31 +0200
commitfb39c5f85c94b3536fc977705f29eb2506f0dc07 (patch)
tree8d02ae1e2ca2306d26b8c2d1e5273c3ecfb9106d
parentbc1f4551fa1685df540d629229ed5a7fdcdb2856 (diff)
tests:seek: Wait for ASYNC_DONE between seek execution
-rw-r--r--tests/check/gnl/seek.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/tests/check/gnl/seek.c b/tests/check/gnl/seek.c
index a173f47..3e9679b 100644
--- a/tests/check/gnl/seek.c
+++ b/tests/check/gnl/seek.c
@@ -29,7 +29,7 @@ fill_pipeline_and_check (GstElement * comp, GList * segments, GList * seeks)
CollectStructure *collect;
GstBus *bus;
GstMessage *message;
- gboolean carry_on = TRUE;
+ gboolean carry_on = TRUE, expected_failure;
GstPad *sinkpad;
GList *ltofree = seeks;
@@ -86,14 +86,13 @@ fill_pipeline_and_check (GstElement * comp, GList * segments, GList * seeks)
if (seeks == NULL) {
carry_on = FALSE;
+ GST_DEBUG ("Done seeking");
break;
}
- /* We should have received the segment by then and there should be none left */
- fail_if (collect->expected_segments != NULL,
- "Didn't receive segment corresponding to seek");
+ expected_failure = TRUE;
+ while (expected_failure && carry_on) {
- while (seeks) {
SeekInfo *sinfo = (SeekInfo *) seeks->data;
seeks = seeks->next;
@@ -105,9 +104,10 @@ fill_pipeline_and_check (GstElement * comp, GList * segments, GList * seeks)
g_list_append (collect->expected_segments, segment_new (1.0,
GST_FORMAT_TIME, sinfo->start, sinfo->stop,
sinfo->position));
+
+ expected_failure = FALSE;
}
- /* Seek to 0.5s */
GST_DEBUG ("Seeking to %" GST_TIME_FORMAT ", Expecting (%"
GST_TIME_FORMAT " %" GST_TIME_FORMAT ")",
GST_TIME_ARGS (sinfo->position), GST_TIME_ARGS (sinfo->start),
@@ -122,7 +122,6 @@ fill_pipeline_and_check (GstElement * comp, GList * segments, GList * seeks)
break;
}
- GST_DEBUG ("Seek failed as expected");
if (seeks == NULL)
carry_on = FALSE;
g_free (sinfo);