Merge lp:~mhr3/libunity/define-subscopes into lp:libunity

[Michal Hruby]

Allow definition of subscope ids in master scopes.

Allow definition of subscope ids in master scopes.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:269
http://jenkins.qa.ubuntu.com/job/libunity-ci/82/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-amd64-ci/67
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-armhf-ci/67
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-i386-ci/67

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:270
http://jenkins.qa.ubuntu.com/job/libunity-ci/83/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-amd64-ci/68
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-armhf-ci/68
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-i386-ci/68

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:271
http://jenkins.qa.ubuntu.com/job/libunity-ci/84/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-amd64-ci/69
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-armhf-ci/69
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-i386-ci/69

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

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

340 - yield reg.process_scope (filename, master_prefix);
341 + yield reg.process_scope (filename);

Since you removed master_prefix, can you also remove it from find_scopes_for_master arguments as it's no longer used anywhere?

review: Needs Fixing

[Paweł Stołowski (stolowski)]

9 + private static string extract_scope_id (string path)

This is a good candidate for some nice tests; can you add a test with cases covering absolute/relative paths?

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:273
http://jenkins.qa.ubuntu.com/job/libunity-ci/87/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-amd64-ci/72
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-armhf-ci/72
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-i386-ci/72

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

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

LGTM. +1

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/libunity-autolanding/55/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/generic-cleanup-mbs/1229/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/libunity-saucy-amd64-autolanding/50/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/libunity-saucy-armhf-autolanding/50/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/libunity-saucy-i386-autolanding/50/console

review: Needs Fixing (continuous-integration)

[lp:~mhr3/libunity/define-subscopes]

274. By Michal Hruby on 2013-08-05

Merge trunk

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'protocol/Makefile.am'
--- protocol/Makefile.am	2013-04-01 21:10:41 +0000
+++ protocol/Makefile.am	2013-08-05 10:03:28 +0000
@@ -35,13 +35,17 @@
   -DDATADIR=\"$(DATADIR)\" \
   -I$(srcdir) \
   $(EXTRA_FLAGS) \
-  $(LIBUNITY_CFLAGS)
+  $(LIBUNITY_CFLAGS) \
+  $(COVERAGE_CFLAGS) \
+  $(NULL)
 
 libunity_protocol_private_la_LIBADD = \
   $(LIBUNITY_LIBS)
 
 libunity_protocol_private_la_LDFLAGS = \
-  $(LIBPROTOCOL_LT_LDFLAGS)
+  $(LIBPROTOCOL_LT_LDFLAGS) \
+  $(COVERAGE_LDFLAGS) \
+  $(NULL)
 
 libunity_protocol_private_la_VALAFLAGS = \
   -C \

=== modified file 'protocol/protocol-scope-discovery.vala'
--- protocol/protocol-scope-discovery.vala	2013-07-02 18:42:23 +0000
+++ protocol/protocol-scope-discovery.vala	2013-08-05 10:03:28 +0000
@@ -189,6 +189,48 @@
     private static const string SCOPE_GROUP = "Scope";
     private static const string DESKTOP_GROUP = "Desktop Entry";
 
+    private static string[] scope_file_prefixes = null;
+    private static string extract_scope_id (string path)
+    {
+      string? real_path = null;
+      if (!Path.is_absolute (path))
+      {
+        var f = File.new_for_path (path);
+        real_path = f.get_path ();
+        path = real_path;
+      }
+
+      if (scope_file_prefixes == null)
+      {
+        foreach (unowned string data_dir in Environment.get_system_data_dirs ())
+        {
+          var sys_path = Path.build_path (Path.DIR_SEPARATOR_S,
+                                          data_dir, SCOPES_DIR, null);
+          var f = File.new_for_path (sys_path);
+          // this will resolve relative paths
+          scope_file_prefixes += "%s/".printf (f.get_path ());
+        }
+      }
+
+      string normalized_path = path.replace ("//", "/");
+
+      foreach (unowned string prefix in scope_file_prefixes)
+      {
+        if (normalized_path.has_prefix (prefix))
+        {
+          string without_prefix = normalized_path.substring (prefix.length);
+
+          if (Path.DIR_SEPARATOR_S in without_prefix)
+            return without_prefix.replace (Path.DIR_SEPARATOR_S, "-");
+
+          return without_prefix;
+        }
+      }
+
+      return Path.get_basename (path);
+    }
+
+
     public class ScopeMetadata
     {
       /* careful here, although it's a private lib, keeping it
@@ -221,6 +263,7 @@
 
       private CategoryDefinition[] categories;
       private FilterDefinition[] filters;
+      private string[] subscope_ids;
 
       public unowned CategoryDefinition[] get_categories ()
       {
@@ -231,6 +274,11 @@
         return filters;
       }
 
+      public unowned string[] get_subscope_ids ()
+      {
+        return subscope_ids;
+      }
+
       public void load_from_key_file (KeyFile file) throws Error
       {
         this.domain = null;
@@ -346,6 +394,11 @@
           this.no_content_hint = dgettext (this.domain, file.get_string (SCOPE_GROUP, "NoContentHint"));
         }
 
+        if (file.has_key (SCOPE_GROUP, "Subscopes"))
+        {
+          this.subscope_ids = file.get_string_list (SCOPE_GROUP, "Subscopes");
+        }
+
         const string FILTER_PREFIX = "Filter ";
         const string CATEGORY_PREFIX = "Category ";
 
@@ -433,6 +486,15 @@
         }
       }
 
+      /* Private method cause ScopeMetadata.full_path and .id are null */
+      private static ScopeMetadata for_keyfile (KeyFile file) throws Error
+      {
+        ScopeMetadata data = new ScopeMetadata ();
+        data.load_from_key_file (file);
+
+        return data;
+      }
+
       public static ScopeMetadata for_id (string scope_id) throws Error
       {
         debug ("for_id: %s", scope_id);
@@ -444,13 +506,39 @@
                                                 KeyFileFlags.NONE);
 
         if (!loaded)
-            throw new ParseError.FILE_NOT_FOUND ("Scope not found: %s", scope_id);
+          throw new ParseError.FILE_NOT_FOUND ("Scope not found: %s", scope_id);
 
-        ScopeMetadata data = new ScopeMetadata ();
+        var data = ScopeMetadata.for_keyfile (file);
         data.id = scope_id;
         data.full_path = full_path;
 
-        data.load_from_key_file (file);
+        return data;
+      }
+
+      public static ScopeMetadata for_path (string path) throws Error
+      {
+        debug ("for_path: %s", path);
+
+        bool loaded = true;
+        string full_path;
+
+        var keyfile = new KeyFile ();
+        if (GLib.Path.is_absolute (path))
+        {
+          loaded = keyfile.load_from_file (path, KeyFileFlags.NONE);
+          full_path = path;
+        }
+        else
+        {
+          loaded = keyfile.load_from_data_dirs (path, out full_path, KeyFileFlags.NONE);
+        }
+
+        if (!loaded)
+          throw new ParseError.FILE_NOT_FOUND ("File not found: %s", path);
+
+        ScopeMetadata data = ScopeMetadata.for_keyfile (keyfile);
+        data.full_path = full_path;
+        data.id = extract_scope_id (full_path);
 
         return data;
       }
@@ -474,111 +562,94 @@
     {
     }
 
-    internal static async ScopeMetadata? parse_scope_file (string path, string? master_prefix) throws Error
-    {
-      debug ("parse_scope_file: %s, master_prefix = %s", path, master_prefix);
-
-      bool loaded = true;
-      ScopeMetadata data = new ScopeMetadata ();
-
-      var file = new KeyFile ();
-      if (GLib.Path.is_absolute (path))
-      {
-        loaded = file.load_from_file (path, KeyFileFlags.NONE);
-        data.full_path = path;
-      }
-      else
-      {
-        loaded = file.load_from_data_dirs (path, out data.full_path, KeyFileFlags.NONE);
-      }
-
-      if (!loaded)
-        throw new ParseError.FILE_NOT_FOUND ("File not found: %s", path);
-
-      data.load_from_key_file (file);
-
-      var basename = GLib.Path.get_basename (path);
-      data.id = basename;
-      if (master_prefix != null && master_prefix.length > 0)
-        data.id = "%s-%s".printf (master_prefix, basename);
-
-      debug ("parse_scope_file: %s finished", path);
-      return data;
-    }
-
     /**
      * Process .scope file and scopes in a subdirectory if it's master scope.
      *
      * @param filename path of a .scope file
      */
-    private async void process_scope (string filename, string? master_scope_prefix = null) throws Error
+    private async void process_scope (string filename) throws Error
     {
       debug ("process_scope: %s", filename);
 
-      ScopeMetadata? scope_data = null;
-      scope_data = yield parse_scope_file (filename, master_scope_prefix); // this may throw, in such case don't process this scope (and possibly its subscopes if it was master scope)
-
-      if (scope_data != null)
-      {
-        var scope_node = new ScopeRegistryNode ()
-        {
-          scope_info = scope_data,
-          sub_scopes = null
-        };
-
-        if (scope_data.is_master)
-        {
-          // check if there is a subdirectory with the name of master scope.
-          // note that failure on single sub-scope shouldn't disable master & valid sub-scopes.
-          var scopefile = GLib.File.new_for_path (scope_data.full_path);
-          string scope_name = remove_scope_extension (scope_data.id);
-          var parent = scopefile.get_parent ();
-          if (parent != null)
-          {
-            string check_path = Path.build_filename (parent.get_path (), scope_name);
-
-            if (FileUtils.test (check_path, FileTest.IS_DIR))
-            {
-              GLib.Dir? scope_subdir = null;
-              try
-              {
-                scope_subdir = GLib.Dir.open (check_path);
-              }
-              catch (FileError e)
-              {
-                warning ("Error accessing directory %s", check_path);
-              }
-
-              if (scope_subdir != null)
-              {
-                // iterate over all files, find .*scope
-                string slave_scope_filename;
-                while ((slave_scope_filename = scope_subdir.read_name ()) != null)
-                {
-                  slave_scope_filename = Path.build_filename (check_path, slave_scope_filename);
-                  ScopeMetadata? slave_scope_data = null;
-                  try
-                  {
-                    slave_scope_data = yield parse_scope_file (slave_scope_filename, scope_name);
-                  }
-                  catch (Error e)
-                  {
-                    warning ("Failed to process '%s': %s", slave_scope_filename, e.message);
-                  }
-                  if (slave_scope_data != null)
-                  {
-                    if (scope_node.sub_scopes == null)
-                      scope_node.sub_scopes = new GLib.SList<ScopeMetadata?> ();
-
-                    scope_node.sub_scopes.append (slave_scope_data);
-                  }
-                }
-              }
-            }
-          }
-        }
-
-        scopes_.append (scope_node);
+      ScopeMetadata scope_data = ScopeMetadata.for_path (filename); // this may throw, in such case don't process this scope (and possibly its subscopes if it was master scope)
+      if (scope_data == null) return;
+
+      var scope_node = new ScopeRegistryNode ()
+      {
+        scope_info = scope_data,
+        sub_scopes = null
+      };
+
+      // adding the scope_node now, but we'll update its fields if it's a master
+      scopes_.append (scope_node);
+
+      if (!scope_data.is_master) return;
+
+      /* This is a master scope, find its children */
+
+      // does the master scope hardcode its children?
+      unowned string[] subscopes = scope_data.get_subscope_ids ();
+      if (subscopes.length > 0)
+      {
+        foreach (unowned string subscope_id in subscopes)
+        {
+          try
+          {
+            ScopeMetadata subscope_data = ScopeMetadata.for_id (subscope_id);
+            if (scope_node.sub_scopes == null)
+              scope_node.sub_scopes = new GLib.SList<ScopeMetadata?> ();
+
+            scope_node.sub_scopes.append (subscope_data);
+          }
+          catch (Error e)
+          {
+            warning ("Failed to process '%s': %s", subscope_id, e.message);
+          }
+        }
+      }
+      else
+      {
+        // check if there is a subdirectory with the name of master scope.
+        // note that failure on single sub-scope shouldn't disable master & valid sub-scopes.
+        var scopefile = GLib.File.new_for_path (scope_data.full_path);
+        string scope_name = remove_scope_extension (scope_data.id);
+        var parent = scopefile.get_parent ();
+        if (parent == null) return;
+
+        string check_path = Path.build_filename (parent.get_path (), scope_name);
+
+        if (!FileUtils.test (check_path, FileTest.IS_DIR)) return;
+
+        GLib.Dir? scope_subdir = null;
+        try
+        {
+          scope_subdir = GLib.Dir.open (check_path);
+        }
+        catch (FileError e)
+        {
+          warning ("Error accessing directory %s", check_path);
+        }
+
+        if (scope_subdir == null) return;
+
+        // iterate over all files, find .*scope
+        string slave_scope_filename;
+        while ((slave_scope_filename = scope_subdir.read_name ()) != null)
+        {
+          slave_scope_filename = Path.build_filename (check_path, slave_scope_filename);
+          try
+          {
+            ScopeMetadata slave_scope_data = ScopeMetadata.for_path (slave_scope_filename);
+            if (scope_node.sub_scopes == null)
+              scope_node.sub_scopes = new GLib.SList<ScopeMetadata?> ();
+
+            scope_node.sub_scopes.append (slave_scope_data);
+          }
+          catch (Error e)
+          {
+            warning ("Failed to process '%s': %s", slave_scope_filename, e.message);
+          }
+        }
       }
     }
 
@@ -591,7 +662,7 @@
      */
     public static async ScopeRegistry find_scopes (string start_path) throws Error
     {
-      var reg = yield find_scopes_for_master (start_path, null);
+      var reg = yield find_scopes_for_master (start_path);
       return reg;
     }
 
@@ -602,7 +673,7 @@
      * @param start_path starting directory or specific .scope file
      * @return registry of all scopes (if start_path is a dir) or just one scope and its subscopes.
      */
-    private static async ScopeRegistry find_scopes_for_master (string start_path, string? master_prefix) throws Error
+    private static async ScopeRegistry find_scopes_for_master (string start_path) throws Error
     {
       debug ("find_scopes_for_master: %s\n", start_path);
 
@@ -621,7 +692,7 @@
             debug ("Found scope file: %s", filename);
             try // failure of single scope shouldn't break processing of others scopes
             {
-              yield reg.process_scope (filename, master_prefix);
+              yield reg.process_scope (filename);
             }
             catch (Error e)
             {
@@ -655,7 +726,7 @@
     /**
      * Find sub-scopes for given master scope id in unity/scopes subdirectory
      * of XDG_DATA_DIRS dirs or in root_path.
-     * @param scope_id id of a master scope (with or without .scope suffix)
+     * @param scope_id id of a master scope (with .scope suffix)
      * @param root_path base directory of scopes, defaults to XDG_DATA_DIRS paths + "/unity/scopes"
      * @return scope registry with scopes property populated with all sub-scopes of the master scope.
      */
@@ -678,13 +749,41 @@
         throw new ParseError.INVALID_PATH ("Invalid scopes path");
       }
 
+      // try to find the master scope file
+      try
+      {
+        var master_scope_metadata = ScopeMetadata.for_id (scope_id);
+        unowned string[] subscopes = master_scope_metadata.get_subscope_ids ();
+        if (subscopes.length > 0)
+        {
+          var reg = new ScopeRegistry ();
+          foreach (unowned string subscope_id in subscopes)
+          {
+            var node = new ScopeRegistryNode ();
+            try
+            {
+              node.scope_info = ScopeMetadata.for_id (subscope_id);
+              reg.scopes_.append (node);
+            }
+            catch (Error err)
+            {
+            }
+          }
+          return reg;
+        }
+      }
+      catch (Error err)
+      {
+        // silently ignore
+      }
+
       var sc = remove_scope_extension (scope_id);
       foreach (var path in dirs)
       {
         var check_path = root_path == null ? Path.build_path (Path.DIR_SEPARATOR_S, path, SCOPES_DIR, sc) : Path.build_path (Path.DIR_SEPARATOR_S, root_path, sc);
         if (FileUtils.test (check_path, FileTest.IS_DIR))
         {
-          var reg = yield find_scopes_for_master (check_path, sc);
+          var reg = yield find_scopes_for_master (check_path);
           return reg;
         }
       }

=== added file 'test/data/unity/scopes/masterscope_c.scope'
--- test/data/unity/scopes/masterscope_c.scope	1970-01-01 00:00:00 +0000
+++ test/data/unity/scopes/masterscope_c.scope	2013-08-05 10:03:28 +0000
@@ -0,0 +1,20 @@
+[Scope]
+GroupName=com.canonical.Unity.Scope.MasterC
+UniqueName=/com/canonical/unity/scope/masterc
+Icon=/usr/share/unity/6/icon2.svg
+IsMaster=true
+# Keywords is localized
+Type=booze
+Name=Sample Master Scope 3
+Description=Finds almost everything
+SearchHint=Search things
+NoContentHint=Sorry to make you a sad panda, but there's nothing here.
+Subscopes=test_masterscope.scope;
+
+[Desktop Entry]
+X-Ubuntu-Gettext-Domain=fakedomain
+
+[Category cat1]
+Name=Category #1
+Icon=/usr/share/unity/category1_icon.svg
+DedupField=uri

=== modified file 'test/vala/test-scope-discovery.vala'
--- test/vala/test-scope-discovery.vala	2013-07-11 10:34:15 +0000
+++ test/vala/test-scope-discovery.vala	2013-08-05 10:03:28 +0000
@@ -109,6 +109,7 @@
 
       bool got_masterscope_1 = false;
       bool got_masterscope_2 = false;
+      bool got_masterscope_3 = false;
 
       foreach (var node in reg.scopes)
       {
@@ -164,10 +165,19 @@
 
           got_masterscope_2 = true;
         }
+        else if (inf.name == "Sample Master Scope 3")
+        {
+          assert (inf.id == "masterscope_c.scope");
+
+          assert (node.sub_scopes.length () == 1);
+          assert (node.sub_scopes.nth_data (0).id == "test_masterscope.scope");
+          got_masterscope_3 = true;
+        }
       }
 
       assert (got_masterscope_1 == true);
       assert (got_masterscope_2 == true);
+      assert (got_masterscope_3 == true);
     }
 
     internal static void test_find_specific_scope ()

=== modified file 'test/vala/test-scope.vala'
--- test/vala/test-scope.vala	2013-08-01 13:09:05 +0000
+++ test/vala/test-scope.vala	2013-08-05 10:03:28 +0000
@@ -136,6 +136,8 @@
         Fixture.create<MasterScopeTester> (MasterScopeTester.test_push_results_and_search));
     Test.add_data_func ("/Unit/MasterScope/SubscopesSearch",
         Fixture.create<MasterScopeTester> (MasterScopeTester.test_subscopes_search));
+    Test.add_data_func ("/Unit/MasterScope/OverriddenSubscopes",
+        Fixture.create<MasterScopeTester> (MasterScopeTester.test_overridden_subscopes));
     Test.add_data_func ("/Unit/MasterScope/ProgressSourceProperty",
         Fixture.create<MasterScopeTester> (MasterScopeTester.test_progress_source_property));
     Test.add_data_func ("/Unit/AggregatorScope/CategoryOrderSignal",
@@ -1413,22 +1415,24 @@
       }
     }
 
-    public static bool own_bus_name (out uint owning_id)
+    public static uint own_bus_name (string name = DBUS_NAME)
     {
-      bool name_owned = false;
+      bool dbus_name_owned = false;
+      uint owning_id;
       var ml = new MainLoop ();
       // register us a name on the bus
-      owning_id = Bus.own_name (BusType.SESSION, DBUS_NAME, 0,
+      owning_id = Bus.own_name (BusType.SESSION, name, 0,
                                 () => {},
-                                () => { name_owned = true; ml.quit (); },
+                                () => { dbus_name_owned = true; ml.quit (); },
                                 () => { ml.quit (); });
       ml.run ();
-      return name_owned;
+      assert (dbus_name_owned == true);
+      return owning_id;
     }
 
     private void setup ()
     {
-      assert (own_bus_name (out owning_id));
+      owning_id = own_bus_name ();
       master_scope = new Unity.MasterScope (MASTER_SCOPE_DBUS_PATH,
                                             "test_masterscope.scope");
       master_scope.search_hint = "Master search hint";
@@ -1975,8 +1979,6 @@
 
     public void test_subscopes_filter_hint ()
     {
-      assert (proxy != null);
-
       Dee.SerializableModel model;
       var channel_id = ScopeTester.open_channel (proxy, ChannelType.DEFAULT, out model);
       assert (channel_id != null);
@@ -1994,8 +1996,6 @@
 
     public void test_push_results ()
     {
-      assert (proxy != null);
-
       Dee.SerializableModel model;
       var channel_id = ScopeTester.open_channel (proxy, ChannelType.DEFAULT, out model);
       assert (channel_id != null);
@@ -2019,8 +2019,6 @@
 
     public void test_push_results_and_search ()
     {
-      assert (proxy != null);
-
       Dee.SerializableModel model;
       var channel_id = ScopeTester.open_channel (proxy, ChannelType.DEFAULT, out model);
       assert (channel_id != null);
@@ -2065,8 +2063,6 @@
 
     public void test_subscopes_search ()
     {
-      assert (proxy != null);
-
       Dee.SerializableModel model;
       var channel_id = ScopeTester.open_channel (proxy, ChannelType.DEFAULT, out model);
       assert (channel_id != null);
@@ -2092,6 +2088,49 @@
       assert (model.get_n_rows () == 1);
     }
 
+    public void test_overridden_subscopes ()
+    {
+      const string MASTER_C_DBUS_NAME = "com.canonical.Unity.Scope.MasterC";
+      const string MASTER_C_DBUS_PATH = "/com/canonical/unity/scope/masterc";
+      // this master scope will query the one that was prepared in this.setup()
+      // which in turn just queries the ChildScopes, so it's one level up from
+      // all the other master scope tests
+      uint master_own_id = own_bus_name (MASTER_C_DBUS_NAME);
+      var master_c = new Unity.MasterScope (MASTER_C_DBUS_PATH,
+                                            "masterscope_c.scope");
+      master_c.search_hint = "Master search hint";
+
+      var cats = new Unity.CategorySet ();
+      cats.add (new Unity.Category ("1991", "Unused category", new GLib.ThemedIcon ("text")));
+      cats.add (new Unity.Category ("1211", "A Category", new GLib.ThemedIcon ("text")));
+      master_c.categories = cats;
+ 
+      try
+      {
+        master_c.export ();
+      }
+      catch (Error err) { assert_not_reached (); }
+
+      var proxy_c = ScopeInitTester.acquire_test_proxy (MASTER_C_DBUS_PATH, MASTER_C_DBUS_NAME);
+
+      // setup finished
+      Dee.SerializableModel model;
+      var channel_id = ScopeTester.open_channel (proxy_c, ChannelType.DEFAULT, out model);
+      assert (channel_id != null);
+
+      var hints = new HashTable<string, Variant> (str_hash, str_equal);
+      var reply_dict = ScopeTester.perform_search (proxy_c, channel_id, "foo",
+                                                   hints, model);
+
+      assert (reply_dict != null);
+      // standard search, should invoke all subscopes
+      assert (search_handler_invocations == child_scopes.length);
+      assert (model.get_n_rows () == child_scopes.length);
+
+      master_c.unexport ();
+      if (master_own_id != 0) Bus.unown_name (master_own_id);
+    }
+
     public void test_progress_source_property ()
     {
       Dee.SerializableModel model;
@@ -2176,7 +2215,7 @@
 
     private void setup ()
     {
-      assert (MasterScopeTester.own_bus_name (out owning_id));
+      owning_id = MasterScopeTester.own_bus_name ();
       // setup Home Scope
       agg_scope = new AggScope (HOME_SCOPE_DBUS_PATH, "test_homescope.scope");
       try