ges: Cleanup edit_deeply_nested_timeline_too_short and make more deterministic

By running the clock manually
And ignoring 'position' in segments which are not always the sames

2 files changed, 20 insertions, 9 deletions

diff --git a/ges/scenarios/edit_deeply_nested_timeline_too_short.validatetest b/ges/scenarios/edit_deeply_nested_timeline_too_short.validatetest
index 10ae847..0c77cb6 100644
--- a/ges/scenarios/edit_deeply_nested_timeline_too_short.validatetest
+++ b/ges/scenarios/edit_deeply_nested_timeline_too_short.validatetest
@@ -5,14 +5,18 @@ meta,
     needs_preroll=true,
     tool = "ges-launch-$(gst_api_version)",
     args = {
-        "--track-type=video",
-        --videosink, "$(videosink) name=videosink",
+        "--track-types=video",
+        --videosink, "$(videosink) sync=true name=videosink",
         --video-caps, "video/x-raw,format=I420,chroma-site=mpeg2,colorimetry=bt709",
     },
     configs = {
         "$(validateflow), pad=videosink:sink, record-buffers=true,
-            ignored-fields=\"stream-start={stream-id,group-id,stream}\",
+            ignored-fields=\"stream-start={stream-id,group-id,stream},buffer={meta},segment={position}\",
             caps-properties={height,width,framerate}",
+    },
+    expected-issues = {
+        # Sometimes the segment arrives before the caps, and sometimes the other way around
+        "expected-issue, issue-id=validateflow::mismatch, details=\".*event segment:.*\\\\n.*\\\\n.*event caps:.*\", sometimes=true",
     }
 
 set-vars,
@@ -42,3 +46,9 @@ checkpoint, text="Paused pipeline, now editing nested timeline and committing."
 edit-container, project-uri="$(nested_timeline_uri)", container-name="clip", position=1.0, edit-mode="edit_trim", edge="edge_end"
 commit
 play
+crank-clock
+check-position, expected-position=3.0
+crank-clock, repeat=30
+check-position, expected-position=4.0
+crank-clock
+stop, on-message=eos
diff --git a/ges/scenarios/edit_deeply_nested_timeline_too_short/flow-expectations/log-videosink-sink-expected b/ges/scenarios/edit_deeply_nested_timeline_too_short/flow-expectations/log-videosink-sink-expected
index 11a96ee..f106769 100644
--- a/ges/scenarios/edit_deeply_nested_timeline_too_short/flow-expectations/log-videosink-sink-expected
+++ b/ges/scenarios/edit_deeply_nested_timeline_too_short/flow-expectations/log-videosink-sink-expected
@@ -1,17 +1,17 @@
 event stream-start: GstEventStreamStart, flags=(GstStreamFlags)GST_STREAM_FLAG_NONE;
 event caps: video/x-raw, width=(int)1080, height=(int)720, framerate=(fraction)1/1;
-event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=0:00:04.000000000, flags=0x01, time=0:00:00.000000000, base=0:00:00.000000000, position=none
-buffer: pts=0:00:00.000000000, dur=0:00:01.000000000, meta=GstVideoMeta
+event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=0:00:04.000000000, flags=0x01, time=0:00:00.000000000, base=0:00:00.000000000
+buffer: pts=0:00:00.000000000, dur=0:00:01.000000000
 event flush-start: (no structure)
 event flush-stop: GstEventFlushStop, reset-time=(boolean)true;
-event segment: format=TIME, start=0:00:03.000000000, offset=0:00:00.000000000, stop=0:00:04.000000000, flags=0x01, time=0:00:03.000000000, base=0:00:00.000000000, position=none
-buffer: pts=0:00:03.000000000, dur=0:00:01.000000000, meta=GstVideoMeta
+event segment: format=TIME, start=0:00:03.000000000, offset=0:00:00.000000000, stop=0:00:04.000000000, flags=0x01, time=0:00:03.000000000, base=0:00:00.000000000
+buffer: pts=0:00:03.000000000, dur=0:00:01.000000000
 
 CHECKPOINT: Paused pipeline, now editing nested timeline and committing.
 
 event flush-start: (no structure)
 event flush-stop: GstEventFlushStop, reset-time=(boolean)true;
-event segment: format=TIME, start=0:00:03.000000000, offset=0:00:00.000000000, stop=0:00:04.000000000, flags=0x01, time=0:00:03.000000000, base=0:00:00.000000000, position=none
+event segment: format=TIME, start=0:00:03.000000000, offset=0:00:00.000000000, stop=0:00:04.000000000, flags=0x01, time=0:00:03.000000000, base=0:00:00.000000000
 event caps: video/x-raw, width=(int)1080, height=(int)720, framerate=(fraction)30/1;
 buffer: pts=0:00:03.000000000, dur=0:00:00.033333333
 buffer: pts=0:00:03.033333333, dur=0:00:00.033333334
@@ -44,5 +44,6 @@ buffer: pts=0:00:03.900000000, dur=0:00:00.033333333
 buffer: pts=0:00:03.933333333, dur=0:00:00.033333334
 buffer: pts=0:00:03.966666667, dur=0:00:00.033333333
 event caps: video/x-raw, width=(int)320, height=(int)240, framerate=(fraction)30/1;
-event segment: format=TIME, start=0:00:04.000000000, offset=0:00:00.000000000, stop=0:00:04.000000001, flags=0x01, time=0:00:04.000000000, base=0:00:01.000000000, position=none
+event segment: format=TIME, start=0:00:04.000000000, offset=0:00:00.000000000, stop=0:00:04.000000001, flags=0x01, time=0:00:04.000000000, base=0:00:01.000000000
+buffer: pts=0:00:04.000000000, dur=0:00:00.000000001
 event eos: (no structure)