tracker: Fix tracker unit tests to wait until persona store is prepared.

diff --git a/tests/tracker/link-personas-via-local-ids.vala b/tests/tracker/link-personas-via-local-ids.vala
index 0d8a1ae..0b2d8a5 100644 (file)
--- a/tests/tracker/link-personas-via-local-ids.vala
+++ b/tests/tracker/link-personas-via-local-ids.vala
@@ -118,8 +118,7 @@ public class LinkPersonasViaLocalIDsTests : Folks.TestCase
                 break;
             }
           assert (pstore != null);
-
-          yield _add_personas (pstore);
+          pstore.notify["is-prepared"].connect (this._persona_store_prepared_cb);
         }
       catch (GLib.Error e)
         {
@@ -127,6 +126,13 @@ public class LinkPersonasViaLocalIDsTests : Folks.TestCase
         }
     }
 
+  private void _persona_store_prepared_cb (Object obj, ParamSpec params)
+    {
+      PersonaStore pstore = (!)(obj as PersonaStore);
+      
+      _add_personas (pstore);
+    }
+
   /* Here is how this test is expected to work:
    * - we start by adding 2 personas
    * - this should trigger individuals-changed with 2 new individuals

diff --git a/tests/tracker/link-personas.vala b/tests/tracker/link-personas.vala
index 57abf86..501ccf7 100644 (file)
--- a/tests/tracker/link-personas.vala
+++ b/tests/tracker/link-personas.vala
@@ -119,8 +119,7 @@ public class LinkPersonasTests : Folks.TestCase
                 break;
             }
           assert (pstore != null);
-
-          yield _add_personas (pstore);
+          pstore.notify["is-prepared"].connect (this._persona_store_prepared_cb);
         }
       catch (GLib.Error e)
         {
@@ -128,6 +127,13 @@ public class LinkPersonasTests : Folks.TestCase
         }
     }
 
+  private void _persona_store_prepared_cb (Object obj, ParamSpec params)
+    {
+      PersonaStore pstore = (!)(obj as PersonaStore);
+      
+      _add_personas (pstore);
+    }
+  
   /* Here is how this test is expected to work:
    * - we start by adding 2 personas
    * - this should trigger individuals-changed with 2 new individuals