diff --git a/ges/ges-timeline.c b/ges/ges-timeline.c
index b8d1057a73..99d88ea821 100644
--- a/ges/ges-timeline.c
+++ b/ges/ges-timeline.c
@@ -1443,7 +1443,8 @@ layer_object_removed_cb (GESLayer * layer, GESClip * clip,
return;
}
- GST_DEBUG ("Clip %p removed from layer %p", clip, layer);
+ GST_DEBUG_OBJECT (timeline, "Clip %" GES_FORMAT " removed from layer %p",
+ GES_ARGS (clip), layer);
/* Go over the clip's track element and figure out which one belongs to
* the list of tracks we control */
diff --git a/tests/check/python/test_timeline.py b/tests/check/python/test_timeline.py
index 2660d486a4..919b068de4 100644
--- a/tests/check/python/test_timeline.py
+++ b/tests/check/python/test_timeline.py
@@ -1001,11 +1001,6 @@ class TestTransitions(common.GESSimpleTimelineTest):
-
-
-
-
-
@@ -1019,13 +1014,16 @@ class TestTransitions(common.GESSimpleTimelineTest):
timeline = project.extract()
mainloop = common.create_main_loop()
- mainloop.run(until_empty=True)
+ def loaded_cb(unused_project, unused_timeline):
+ mainloop.quit()
+ project.connect("loaded", loaded_cb)
+
+ mainloop.run()
layers = timeline.get_layers()
self.assertEqual(len(layers), 2)
self.assertTrue(layers[0].props.auto_transition)
- self.assertTrue(layers[1].props.auto_transition)
def test_transition_type(self):
xges = self.create_xges()
@@ -1034,10 +1032,13 @@ class TestTransitions(common.GESSimpleTimelineTest):
timeline = project.extract()
mainloop = common.create_main_loop()
- mainloop.run(until_empty=True)
+ def loaded_cb(unused_project, unused_timeline):
+ mainloop.quit()
+ project.connect("loaded", loaded_cb)
+ mainloop.run()
layers = timeline.get_layers()
- self.assertEqual(len(layers), 2)
+ self.assertEqual(len(layers), 1)
clips = layers[0].get_clips()
clip1 = clips[0]
@@ -1048,10 +1049,6 @@ class TestTransitions(common.GESSimpleTimelineTest):
self.assertLess(clip1.props.start + clip1.props.duration, clip2.props.start + clip2.props.duration)
self.assertEqual(len(clips), 3)
- # 3 clips would be overlapping, 1 of them wasn't added!
- clips = layers[1].get_clips()
- self.assertEqual(len(clips), 3)
-
class TestPriorities(common.GESSimpleTimelineTest):