[folks] Add mainloop to eds test backend tear_down to wait for addressbook removal.



commit a155d6b645fe855de6c4dcb07e85c44f0b3158d9
Author: Jeremy Whiting <jpwhiting kde org>
Date:   Mon Jun 25 13:06:26 2012 -0600

    Add mainloop to eds test backend tear_down to wait for addressbook removal.

 tests/lib/eds/backend.vala |   33 +++++++++++++++++++--------------
 1 files changed, 19 insertions(+), 14 deletions(-)
---
diff --git a/tests/lib/eds/backend.vala b/tests/lib/eds/backend.vala
index 8eab352..8ff8fb8 100644
--- a/tests/lib/eds/backend.vala
+++ b/tests/lib/eds/backend.vala
@@ -259,27 +259,32 @@ public class EdsTest.Backend
 
   public void tear_down ()
     {
+      var mainloop = new GLib.MainLoop (null, false);
+
       Environment.set_variable ("FOLKS_BACKEND_EDS_USE_ADDRESS_BOOKS",
-          "", true);
+                                "", true);
 
-        this._addressbook.remove.begin (null, (o, r) =>
+      this._addressbook.remove.begin (null, (o, r) =>
         {
           try
-          {
-            var ret = this._addressbook.remove.end (r);
-            if (ret == false)
             {
-              GLib.warning ("remove() addressbook returned false on %s\n",
-              this._addressbook_name);
+              var ret = this._addressbook.remove.end (r);
+              if (ret == false)
+                {
+                  GLib.warning ("remove() addressbook returned false on %s\n",
+                  this._addressbook_name);
+                }
+              this._addressbook = null;
             }
-            this._addressbook = null;
-          }
           catch (GLib.Error e)
-          {
-            GLib.warning ("Unable to remove addressbook %s because: %s\n",
-            this._addressbook_name, e.message);
-          }
-          });
+            {
+              GLib.warning ("Unable to remove addressbook %s because: %s\n",
+              this._addressbook_name, e.message);
+            }
+            mainloop.quit();
+        });
+
+      mainloop.run();
     }
 
   private Gee.HashMap<string, string> _parse_addrs (string addr_s)



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