[pitivi] tests: Fix loading project with moved asset and deleted proxies



commit 7c29f0754483a1ac049312bb40aab95088c4d1b5
Author: Thibault Saunier <tsaunier igalia com>
Date:   Mon Jul 15 16:23:36 2019 -0400

    tests: Fix loading project with moved asset and deleted proxies
    
    Now that loading projects is done in two passes, there is enough time
    for proxies to be created before the project is loaded, the race always
    existed but recent changes in GES reveals it.
    
    Make sure that all proxies are created to stop the mainloop.

 tests/test_project.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/tests/test_project.py b/tests/test_project.py
index 63c8e18b..b18cc845 100644
--- a/tests/test_project.py
+++ b/tests/test_project.py
@@ -477,8 +477,12 @@ class TestProjectLoading(common.TestCase):
 
         mainloop = common.create_main_loop()
 
+        created_proxies = []
+
         def proxy_ready_cb(unused_proxy_manager, asset, proxy):
-            mainloop.quit()
+            created_proxies.append(asset)
+            if len(created_proxies) == 2:
+                mainloop.quit()
 
         app = common.create_pitivi(proxyingStrategy=ProxyingStrategy.ALL)
         app.proxy_manager.connect("proxy-ready", proxy_ready_cb)
@@ -518,10 +522,9 @@ class TestProjectLoading(common.TestCase):
             mainloop.run()
             self.assertEqual(len(medialib.storemodel), 2,
                 "We should have one asset displayed in the MediaLibrary.")
-            self.assertEqual(medialib.storemodel[0][medialibrary.COL_THUMB_DECORATOR].state,
-                             medialibrary.AssetThumbnail.PROXIED)
-            self.assertEqual(medialib.storemodel[1][medialibrary.COL_THUMB_DECORATOR].state,
-                             medialibrary.AssetThumbnail.IN_PROGRESS)
+
+            self.assertEqual(medialib.storemodel[0][medialibrary.COL_THUMB_DECORATOR].state, 
medialibrary.AssetThumbnail.PROXIED)
+            self.assertEqual(medialib.storemodel[1][medialibrary.COL_THUMB_DECORATOR].state, 
medialibrary.AssetThumbnail.PROXIED)
 
 
 class TestProjectSettings(common.TestCase):


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]