Merge lp:~mhr3/libunity/scope-tests-fixes into lp:libunity

[Michal Hruby]

A couple of fixes to the scope tests.

Properly fix the possible hanging of the search and preview methods (which tried to acquire the default MainContext from a non-main thread).
Also fix a couple of compiler warnings.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:221
http://jenkins.qa.ubuntu.com/job/libunity-ci/13/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-raring-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-raring-armhf-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-raring-i386-ci/13

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libunity-ci/13/rebuild

review: Approve (continuous-integration)

[James Henstridge (jamesh)]

Looks good.

review: Approve

=== modified file 'test/vala/test-scope.vala'
--- test/vala/test-scope.vala	2013-05-23 11:49:58 +0000
+++ test/vala/test-scope.vala	2013-05-30 23:44:26 +0000
@@ -180,21 +180,8 @@
 
     public override void run ()
     {
-      var ml = new MainLoop ();
-      // simulating async search
+      // careful this is running in separate thread
       owner.search (this);
-      Idle.add (() => { ml.quit (); return false; });
-      ml.run ();
-    }
-
-    /* FIXME: workaround for problem with default implementation of run_async
-       that occasionally misbehaves; shouldn't be needed anymore once we
-       determine the root cause.
-    */
-    public override void run_async (Unity.ScopeSearchBaseCallback async_callback)
-    {
-        run ();
-        async_callback (this);
     }
   }
 
@@ -209,24 +196,10 @@
 
     public override Unity.AbstractPreview? run ()
     {
-      var ml = new MainLoop ();
-      // simulating async search
+      // careful this is running in separate thread
       var preview = owner.preview (this);
-      Idle.add (() => { ml.quit (); return false; });
-      ml.run ();
-
       return preview;
     }
-
-    /* FIXME: workaround for problem with default implementation of run_async
-       that occasionally misbehaves; shouldn't be needed anymore once we
-       determine the root cause.
-    */
-    public override void run_async (Unity.AbstractPreviewCallback async_callback)
-    {
-        var preview = run ();
-        async_callback (this, preview);
-    }
   }
 
   class TestScope: Unity.AbstractScope
@@ -310,7 +283,7 @@
     }
 
     private Unity.ScopeDBusConnector connector;
-    public void export ()
+    public void export () throws Error
     {
       connector = new Unity.ScopeDBusConnector (this);
       connector.export ();
@@ -366,7 +339,11 @@
     public void test_scope_proxy ()
     {
       scope = new TestScope (DBUS_PATH);
-      scope.export ();
+      try
+      {
+        scope.export ();
+      }
+      catch (Error err) { assert_not_reached (); }
 
       var proxy = acquire_test_proxy ();
       assert (proxy != null);
@@ -452,24 +429,32 @@
                                 null,
                                 (obj, res) =>
       {
-        channel_id = proxy.open_channel.end (res, out real_model);
-        if (wait_for_synchronization && real_model is Dee.SharedModel)
+        try
         {
-          var shared_model = real_model as Dee.SharedModel;
-          signals += new SignalWrapper (shared_model, 
-            shared_model.notify["synchronized"].connect (() =>
+          channel_id = proxy.open_channel.end (res, out real_model);
+          if (wait_for_synchronization && real_model is Dee.SharedModel)
+          {
+            var shared_model = real_model as Dee.SharedModel;
+            signals += new SignalWrapper (shared_model, 
+              shared_model.notify["synchronized"].connect (() =>
+            {
+              ml.quit ();
+            }));
+            if (shared_model.is_synchronized ()) ml.quit ();
+          }
+          else
           {
             ml.quit ();
-          }));
-          if (shared_model.is_synchronized ()) ml.quit ();
+          }
         }
-        else
+        catch (Error err)
         {
           ml.quit ();
         }
       });
 
       assert (run_with_timeout (ml));
+      assert (channel_id != null);
       signals = {};
       model = real_model as Dee.SerializableModel;
       return channel_id;
@@ -481,7 +466,11 @@
       proxy.close_channel.begin (channel_id, null,
                                  (obj, res) =>
       {
-        proxy.close_channel.end (res);
+        try
+        {
+          proxy.close_channel.end (res);
+        }
+        catch (Error err) { /* silently ignore */ }
         ml.quit ();
       });
 
@@ -997,31 +986,31 @@
       try
       {
         master_scope.export ();
+
+        // init child scopes
+        ChildScope child_scope;
+        child_scope = new ChildScope ("/com/canonical/unity/scope/childscope_1",
+                                      "test_masterscope-childscope_1.scope");
+        child_scope.filters = filters; // set filters for one child scope
+        child_scope.search_changed.connect (child_search_handler);
+        child_scope.export ();
+        child_scopes += child_scope;
+
+        child_scope = new ChildScope ("/com/canonical/unity/scope/childscope_2",
+                                      "test_masterscope-childscope_2.scope");
+        child_scope.search_changed.connect (child_search_handler);
+        child_scope.export ();
+        child_scopes += child_scope;
+
+        // this one has GlobalSearches=false
+        child_scope = new ChildScope ("/com/canonical/unity/scope/childscope_3",
+                                      "test_masterscope-childscope_3.scope");
+        child_scope.search_changed.connect (child_search_handler);
+        child_scope.export ();
+        child_scopes += child_scope;
       }
       catch (Error err) { assert_not_reached (); }
 
-      // init child scopes
-      ChildScope child_scope;
-      child_scope = new ChildScope ("/com/canonical/unity/scope/childscope_1",
-                                    "test_masterscope-childscope_1.scope");
-      child_scope.filters = filters; // set filters for one child scope
-      child_scope.search_changed.connect (child_search_handler);
-      child_scope.export ();
-      child_scopes += child_scope;
-
-      child_scope = new ChildScope ("/com/canonical/unity/scope/childscope_2",
-                                    "test_masterscope-childscope_2.scope");
-      child_scope.search_changed.connect (child_search_handler);
-      child_scope.export ();
-      child_scopes += child_scope;
-
-      // this one has GlobalSearches=false
-      child_scope = new ChildScope ("/com/canonical/unity/scope/childscope_3",
-                                    "test_masterscope-childscope_3.scope");
-      child_scope.search_changed.connect (child_search_handler);
-      child_scope.export ();
-      child_scopes += child_scope;
-
       proxy = ScopeInitTester.acquire_test_proxy (MASTER_SCOPE_DBUS_PATH);
       assert (proxy != null);
     }
@@ -1488,6 +1477,7 @@
 
       var reply_dict = ScopeTester.push_results (proxy, channel_id, "foo", "test_masterscope-pushed.scope", pushed_model, {"1211"}, model);
 
+      assert (reply_dict != null);
       assert (model.get_n_rows () == 1);
       var iter = model.get_first_iter ();
       assert (model.get_string (iter, 0) == "remote:foo");