tests: By design, we can get twice the same GstSegment out

Handle it in the tests as it is not critical

2 files changed, 8 insertions, 7 deletions

diff --git a/tests/check/gnl/common.c b/tests/check/gnl/common.c
index a163adc..4417b7a 100644
--- a/tests/check/gnl/common.c
+++ b/tests/check/gnl/common.c
@@ -108,7 +108,9 @@ sinkpad_event_probe (GstPad * sinkpad, GstEvent * event,
       GST_EVENT_TYPE_NAME (event), GST_EVENT_SEQNUM (event), collect);
 
   if (GST_EVENT_TYPE (event) == GST_EVENT_SEGMENT) {
-    fail_if (collect->expected_segments == NULL, "Received unexpected segment");
+    fail_if (collect->expected_segments == NULL,
+        "Received unexpected segment on pad: %s:%s",
+        GST_DEBUG_PAD_NAME (sinkpad));
 
     if (!collect->gotsegment)
       collect->seen_segments =
@@ -124,11 +126,7 @@ sinkpad_event_probe (GstPad * sinkpad, GstEvent * event,
 
     segment = (Segment *) collect->expected_segments->data;
 
-    if (compare_segments (collect, segment, event)) {
-      collect->expected_segments =
-          g_list_remove (collect->expected_segments, segment);
-      g_free (segment);
-    }
+    compare_segments (collect, segment, event);
     collect->gotsegment = TRUE;
   }
 
diff --git a/tests/check/gnl/seek.c b/tests/check/gnl/seek.c
index 3e9679b..fea15f9 100644
--- a/tests/check/gnl/seek.c
+++ b/tests/check/gnl/seek.c
@@ -86,13 +86,16 @@ fill_pipeline_and_check (GstElement * comp, GList * segments, GList * seeks)
 
           if (seeks == NULL) {
             carry_on = FALSE;
+            g_list_free_full (collect->expected_segments, g_free);
+            collect->expected_segments = NULL;
             GST_DEBUG ("Done seeking");
             break;
           }
 
+          g_list_free_full (collect->expected_segments, g_free);
+          collect->expected_segments = NULL;
           expected_failure = TRUE;
           while (expected_failure && carry_on) {
-
             SeekInfo *sinfo = (SeekInfo *) seeks->data;
 
             seeks = seeks->next;