Merge lp:~marcustomlinson/unity-scopes-api/merge-trunk into lp:unity-scopes-api/devel

[Marcus Tomlinson]

Merge trunk.

Merge trunk.

[Michal Hruby (mhr3)]

Yep, +1

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-autolanding/357/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-amd64-autolanding/181/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-autolanding/180/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-i386-autolanding/181/console

review: Needs Fixing (continuous-integration)

[lp:~marcustomlinson/unity-scopes-api/merge-trunk]

422. By Marcus Tomlinson on 2014-07-24

Whoops, one change that shouldn't have been reverted

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:422
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/901/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-amd64-ci/455
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-ci/453
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-ci/453/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-i386-ci/453

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-devel-ci/901/rebuild

review: Approve (continuous-integration)

=== modified file 'CONFIGFILES'
--- CONFIGFILES	2014-07-14 06:54:43 +0000
+++ CONFIGFILES	2014-07-24 15:00:51 +0000
@@ -84,7 +84,7 @@
   or terminate correctly. If a scope does not respond
   within the allotted time, it is killed with SIGKILL.
 
-  The default value is 2500 milliseconds.
+  The default value is 4000 milliseconds.
 
   Note that this value must be less than Locate.Timeout in the [<Middleware>]
   config group, otherwise the middleware can prematurely conclude that
@@ -144,7 +144,7 @@
   within the specified time, the invocation throws a TimeoutException, possibly
   after asking the registry to start the target process first (see Locate.Timeout).
 
-  The default value is 300 milliseconds.
+  The default value is 500 milliseconds.
 
 - Smartscopes.Registry.EndpointDir
 
@@ -164,11 +164,11 @@
   in Registry.ini, otherwise invocations on a scope that needs to be activated
   first can fail, even though the activation succeeded.
 
-  Only values in the range 10 to 5000 milliseconds are accepted. (Values outside
+  Only values in the range 10 to 15000 milliseconds are accepted. (Values outside
   this range would either cause locate() to falsely conclude that a scope
   could not be started, or cause an unacceptably long wait time.)
 
-  The default value is 3000 milliseconds.
+  The default value is 5000 milliseconds.
 
 - Registry.Timeout
 
 
=== modified file 'debian/changelog'
--- debian/changelog	2014-07-23 14:12:45 +0000
+++ debian/changelog	2014-07-24 15:00:51 +0000
@@ -5,6 +5,30 @@
 
  -- Marcus Tomlinson <[e-mail]>  Mon, 21 Jul 2014 09:14:39 +0200
 
+unity-scopes-api (0.5.2+14.10.20140723-0ubuntu1) utopic; urgency=low
+
+  [ Pete Woods ]
+  * Normalize relative paths (LP: #1340135)
+
+  [ Marcus Tomlinson ]
+  * Call locate() before every two-way request. Increased two-way
+    invocation timeouts.
+
+  [ Michi Henning ]
+  * Normalize relative paths (LP: #1340135)
+
+ -- Ubuntu daily release <[e-mail]>  Wed, 23 Jul 2014 22:06:06 +0000
+
+unity-scopes-api (0.5.2+14.10.20140722-0ubuntu1) utopic; urgency=low
+
+  [ thomas-voss ]
+  * Force building with g++ 4.9
+
+  [ Michi Henning ]
+  * Force building with g++ 4.9
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 22 Jul 2014 09:52:30 +0000
+
 unity-scopes-api (0.5.2+14.10.20140715-0ubuntu1) utopic; urgency=low
 
   [ Michal Hruby ]
 
=== modified file 'include/unity/scopes/internal/DfltConfig.h.in'
--- include/unity/scopes/internal/DfltConfig.h.in	2014-07-14 06:54:43 +0000
+++ include/unity/scopes/internal/DfltConfig.h.in	2014-07-24 15:00:51 +0000
@@ -49,9 +49,9 @@
 
 static const int DFLT_REAP_EXPIRY = 45;              // seconds
 static const int DFLT_REAP_INTERVAL = 10;            // seconds
-static const int DFLT_PROCESS_TIMEOUT = 2500;        // milliseconds
-static const int DFLT_ZMQ_TWOWAY_TIMEOUT = 300;      // milliseconds
-static const int DFLT_ZMQ_LOCATE_TIMEOUT = 3000;     // milliseconds
+static const int DFLT_PROCESS_TIMEOUT = 4000;        // milliseconds
+static const int DFLT_ZMQ_TWOWAY_TIMEOUT = 500;      // milliseconds
+static const int DFLT_ZMQ_LOCATE_TIMEOUT = 5000;     // milliseconds
 static const int DFLT_ZMQ_REGISTRY_TIMEOUT = 5000;   // milliseconds
 
 } // namespace internal
 
=== modified file 'scoperegistry/scoperegistry.cpp'
--- scoperegistry/scoperegistry.cpp	2014-07-15 05:50:10 +0000
+++ scoperegistry/scoperegistry.cpp	2014-07-24 15:00:51 +0000
@@ -235,6 +235,44 @@
     return click_scopes;
 }
 
+static bool starts_with(const string& compare, const string& prefix)
+{
+    bool result = false;
+    if (compare.length() >= prefix.length())
+    {
+        result = (compare.compare(0, prefix.length(), prefix) == 0);
+    }
+    return result;
+}
+
+static bool is_uri(const string& path)
+{
+    return starts_with(path, "color://")
+            || starts_with(path, "file://")
+            || starts_with(path, "ftp://")
+            || starts_with(path, "gradient://")
+            || starts_with(path, "http://")
+            || starts_with(path, "https://")
+            || starts_with(path, "image://");
+}
+
+void convert_relative_attribute(VariantMap& inner_map, const string& id, const filesystem::path& scope_dir)
+{
+    auto logo_it = inner_map.find(id);
+    if (logo_it != inner_map.end()
+            && logo_it->second.which() == Variant::String)
+    {
+        auto path = logo_it->second.get_string();
+
+        // Do not normalize supported URI schemas
+        if(!is_uri(path))
+        {
+            logo_it->second = Variant(
+                    relative_scope_path_to_abs_path(path, scope_dir).native());
+        }
+    }
+}
+
 // For each scope, open the config file for the scope, create the metadata info from the config,
 // and add an entry to the RegistryObject.
 // If the scope uses settings, also parse the settings file and add the settings to the metadata.
@@ -277,20 +315,49 @@
     mi->set_author(sc.author());
     mi->set_invisible(sc.invisible());
     mi->set_appearance_attributes(sc.appearance_attributes());
+
+    // Prepend scope_dir to pageheader logo path if logo path is relative.
+    // TODO: Once we have type-safe parsing in the config files, remove
+    //       the calls to which(). We should be able to rely on things
+    //       having the correct type. That's the whole point of having
+    //       the *Config classes.
+    auto app_attrs = sc.appearance_attributes();
+    auto ph_it = app_attrs.find("page-header");
+    if (ph_it != app_attrs.end() && ph_it->second.which() == Variant::Dict)
+    {
+        auto inner_map = ph_it->second.get_dict();
+        convert_relative_attribute(inner_map, "logo", scope_dir);
+        convert_relative_attribute(inner_map, "background", scope_dir);
+        convert_relative_attribute(inner_map, "navigation-background", scope_dir);
+        app_attrs["page-header"] = Variant(inner_map);
+    }
+    convert_relative_attribute(app_attrs, "category-header-background", scope_dir);
+    mi->set_appearance_attributes(app_attrs);
+
     mi->set_scope_directory(scope_dir.native());
     mi->set_results_ttl_type(sc.results_ttl_type());
     mi->set_location_data_needed(sc.location_data_needed());
 
     try
     {
-        mi->set_art(relative_scope_path_to_abs_path(sc.art(), scope_dir).native());
+        auto art = sc.art();
+        if (!is_uri(art))
+        {
+            art = relative_scope_path_to_abs_path(art, scope_dir).native();
+        }
+        mi->set_art(art);
     }
     catch (NotFoundException const&)
     {
     }
     try
     {
-        mi->set_icon(relative_scope_path_to_abs_path(sc.icon(), scope_dir).native());
+        auto icon = sc.icon();
+        if (!is_uri(icon))
+        {
+            icon = relative_scope_path_to_abs_path(icon, scope_dir).native();
+        }
+        mi->set_icon(icon);
     }
     catch (NotFoundException const&)
     {
 
=== modified file 'src/scopes/internal/JsonSettingsSchema.cpp'
--- src/scopes/internal/JsonSettingsSchema.cpp	2014-07-16 08:42:30 +0000
+++ src/scopes/internal/JsonSettingsSchema.cpp	2014-07-24 15:00:51 +0000
@@ -49,7 +49,7 @@
 public:
     NONCOPYABLE(Setting);
 
-    explicit Setting(Json::Value const& v);
+    Setting(Json::Value const& v);
     ~Setting() = default;
 
     string id() const;
 
=== modified file 'src/scopes/internal/smartscopes/SSRegistryObject.cpp'
--- src/scopes/internal/smartscopes/SSRegistryObject.cpp	2014-07-04 04:50:38 +0000
+++ src/scopes/internal/smartscopes/SSRegistryObject.cpp	2014-07-24 15:00:51 +0000
@@ -124,9 +124,10 @@
     return scopes_;
 }
 
-ObjectProxy SSRegistryObject::locate(std::string const& /*identity*/)
+ObjectProxy SSRegistryObject::locate(std::string const& identity)
 {
-    throw internal::RegistryException("SSRegistryObject::locate(): operation not available");
+    // Smart Scopes are not fork and execed, so we simply return the proxy here
+    return get_metadata(identity).proxy();
 }
 
 bool SSRegistryObject::is_scope_running(std::string const&)
 
=== modified file 'src/scopes/internal/zmq_middleware/ZmqConfig.cpp'
--- src/scopes/internal/zmq_middleware/ZmqConfig.cpp	2014-07-14 06:54:43 +0000
+++ src/scopes/internal/zmq_middleware/ZmqConfig.cpp	2014-07-24 15:00:51 +0000
@@ -80,9 +80,9 @@
     }
 
     locate_timeout_ = get_optional_int(zmq_config_group, locate_timeout_key, DFLT_ZMQ_LOCATE_TIMEOUT);
-    if (locate_timeout_ < 10 || locate_timeout_ > 5000)
+    if (locate_timeout_ < 10 || locate_timeout_ > 15000)
     {
-        throw_ex("Illegal value (" + to_string(locate_timeout_) + ") for " + locate_timeout_key + ": value must be 10-5000");
+        throw_ex("Illegal value (" + to_string(locate_timeout_) + ") for " + locate_timeout_key + ": value must be 10-15000");
     }
 
     registry_endpoint_dir_ = get_optional_string(zmq_config_group, registry_endpoint_dir_key);
 
=== modified file 'src/scopes/internal/zmq_middleware/ZmqMiddleware.cpp'
--- src/scopes/internal/zmq_middleware/ZmqMiddleware.cpp	2014-07-16 08:46:47 +0000
+++ src/scopes/internal/zmq_middleware/ZmqMiddleware.cpp	2014-07-24 15:00:51 +0000
@@ -863,7 +863,7 @@
         endpoint = "ipc://" + endpoint_dir + "/" + name;
     }
 
-    auto a = make_shared<ObjectAdapter>(*this, name, endpoint, mode, pool_size, idle_timeout);
+    shared_ptr<ObjectAdapter> a(new ObjectAdapter(*this, name, endpoint, mode, pool_size, idle_timeout));
     a->activate();
     am_[name] = a;
     return a;
 
=== modified file 'src/scopes/internal/zmq_middleware/ZmqObject.cpp'
--- src/scopes/internal/zmq_middleware/ZmqObject.cpp	2014-05-29 15:41:42 +0000
+++ src/scopes/internal/zmq_middleware/ZmqObject.cpp	2014-07-24 15:00:51 +0000
@@ -208,41 +208,38 @@
 
 ZmqReceiver ZmqObjectProxy::invoke_twoway_(capnp::MessageBuilder& out_params, int64_t timeout)
 {
-    try
-    {
-        return invoke_twoway__(out_params, timeout);
-    }
-    catch (TimeoutException const&)
-    {
-        auto registry_proxy = mw_base()->registry_proxy();
-
-        // If no registry is configured or if this object is the registry itself, rethrow the exception
-        if (!registry_proxy || identity() == registry_proxy->identity())
-        {
-            throw;
-        }
-
-        // rebind
-        ObjectProxy new_proxy = registry_proxy->locate(identity());
-
-        // update our proxy with the newly received data
-        // (we need to first store values in local variables outside of the mutex,
-        // otherwise we will deadlock on the following ZmqObjectProxy methods)
-        std::string endpoint = new_proxy->endpoint();
-        std::string identity = new_proxy->identity();
-        std::string category = new_proxy->target_category();
-        int64_t timeout = new_proxy->timeout();
-        {
-            lock_guard<mutex> lock(shared_mutex);
-            endpoint_ = endpoint;
-            identity_ = identity;
-            category_ = category;
-            timeout_ = timeout;
-        }
-
-        // retry the invocation
-        return invoke_twoway__(out_params, timeout);
-    }
+    auto registry_proxy = mw_base()->registry_proxy();
+
+    // If a registry is configured and this object is not the registry itself,
+    // attempt to locate the scope before invoking it.
+    if (registry_proxy && identity() != registry_proxy->identity())
+    {
+        try
+        {
+            ObjectProxy new_proxy = registry_proxy->locate(identity());
+            // update our proxy with the newly received data
+            // (we need to first store values in local variables outside of the mutex,
+            // otherwise we will deadlock on the following ZmqObjectProxy methods)
+            std::string endpoint = new_proxy->endpoint();
+            std::string identity = new_proxy->identity();
+            std::string category = new_proxy->target_category();
+            int64_t timeout = new_proxy->timeout();
+            {
+                lock_guard<mutex> lock(shared_mutex);
+                endpoint_ = endpoint;
+                identity_ = identity;
+                category_ = category;
+                timeout_ = timeout;
+            }
+        }
+        catch (NotFoundException const&)
+        {
+            // Ignore a failed locate() for scopes unknown to the registry
+        }
+    }
+
+    // Try the invocation
+    return invoke_twoway__(out_params, timeout);
 }
 
 // Get a socket to the endpoint for this proxy and write the request on the wire.
 
=== modified file 'test/gtest/scopes/Activation/Activation_test.cpp'
--- test/gtest/scopes/Activation/Activation_test.cpp	2014-07-02 09:36:34 +0000
+++ test/gtest/scopes/Activation/Activation_test.cpp	2014-07-24 15:00:51 +0000
@@ -21,6 +21,7 @@
 #include <unity/scopes/CategoryRenderer.h>
 #include <unity/scopes/internal/CategoryRegistry.h>
 #include <unity/scopes/internal/CategorisedResultImpl.h>
+#include <unity/scopes/internal/RegistryObject.h>
 #include <unity/scopes/internal/ResultReplyObject.h>
 #include <unity/scopes/internal/RuntimeImpl.h>
 #include <unity/scopes/internal/ScopeImpl.h>
@@ -514,7 +515,10 @@
 
     RaiiScopeThread(std::string const& scope_id, std::string const& configfile)
         : runtime(Runtime::create_scope_runtime(scope_id, configfile)),
-          scope_thread([this, configfile]{ runtime->run_scope(&scope, configfile, ""); }) {}
+          scope_thread([this, configfile]{ runtime->run_scope(&scope, configfile, ""); })
+    {
+        std::this_thread::sleep_for(std::chrono::milliseconds(500));
+    }
 
     ~RaiiScopeThread()
     {
@@ -523,9 +527,22 @@
     }
 };
 
+std::shared_ptr<core::posix::SignalTrap> trap(core::posix::trap_signals_for_all_subsequent_threads({core::posix::Signal::sig_chld}));
+std::unique_ptr<core::posix::ChildProcess::DeathObserver> death_observer(core::posix::ChildProcess::DeathObserver::create_once_with_signal_trap(trap));
+
+RuntimeImpl::SPtr run_test_registry()
+{
+    RuntimeImpl::SPtr runtime = RuntimeImpl::create("TestRegistry", "Runtime.ini");
+    MiddlewareBase::SPtr middleware = runtime->factory()->create("TestRegistry", "Zmq", "Zmq.ini");
+    RegistryObject::SPtr reg_obj(std::make_shared<RegistryObject>(*death_observer, std::make_shared<Executor>(), middleware));
+    middleware->add_registry_object("TestRegistry", reg_obj);
+    return runtime;
+}
+
 // does actual activation with a test scope
 TEST(Activation, scope)
 {
+    auto reg_rt = run_test_registry();
     RaiiScopeThread<TestScope> scope_thread("TestScope", "Runtime.ini");
 
     // parent: connect to scope and run a query
 
=== modified file 'test/gtest/scopes/Activation/Runtime.ini.in'
--- test/gtest/scopes/Activation/Runtime.ini.in	2014-01-14 17:31:16 +0000
+++ test/gtest/scopes/Activation/Runtime.ini.in	2014-07-24 15:00:51 +0000
@@ -1,5 +1,5 @@
 [Runtime]
-Registry.Identity = Registry
+Registry.Identity = TestRegistry
 Registry.ConfigFile = Registry.ini
 Default.Middleware = Zmq
 Zmq.ConfigFile = Zmq.ini
 
=== modified file 'test/gtest/scopes/Filters/Filters_test.cpp'
--- test/gtest/scopes/Filters/Filters_test.cpp	2014-06-17 10:30:03 +0000
+++ test/gtest/scopes/Filters/Filters_test.cpp	2014-07-24 15:00:51 +0000
@@ -16,6 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
+#include <unity/scopes/internal/RegistryObject.h>
 #include <unity/scopes/internal/RuntimeImpl.h>
 #include <unity/scopes/internal/ScopeImpl.h>
 #include <unity/scopes/internal/FilterBaseImpl.h>
@@ -86,7 +87,10 @@
 
     RaiiScopeThread(std::string const& scope_id, std::string const& configfile)
         : runtime(Runtime::create_scope_runtime(scope_id, configfile)),
-          scope_thread([this, configfile]{ runtime->run_scope(&scope, configfile, ""); }) {}
+          scope_thread([this, configfile]{ runtime->run_scope(&scope, configfile, ""); })
+    {
+        std::this_thread::sleep_for(std::chrono::milliseconds(500));
+    }
 
     ~RaiiScopeThread()
     {
@@ -95,8 +99,21 @@
     }
 };
 
+std::shared_ptr<core::posix::SignalTrap> trap(core::posix::trap_signals_for_all_subsequent_threads({core::posix::Signal::sig_chld}));
+std::unique_ptr<core::posix::ChildProcess::DeathObserver> death_observer(core::posix::ChildProcess::DeathObserver::create_once_with_signal_trap(trap));
+
+RuntimeImpl::SPtr run_test_registry()
+{
+    RuntimeImpl::SPtr runtime = RuntimeImpl::create("TestRegistry", "Runtime.ini");
+    MiddlewareBase::SPtr middleware = runtime->factory()->create("TestRegistry", "Zmq", "Zmq.ini");
+    RegistryObject::SPtr reg_obj(std::make_shared<RegistryObject>(*death_observer, std::make_shared<Executor>(), middleware));
+    middleware->add_registry_object("TestRegistry", reg_obj);
+    return runtime;
+}
+
 TEST(Filters, scope)
 {
+    auto reg_rt = run_test_registry();
     RaiiScopeThread<TestScope> scope_thread("TestScope", "Runtime.ini");
 
     // parent: connect to scope and run a query
 
=== modified file 'test/gtest/scopes/Filters/Runtime.ini.in'
--- test/gtest/scopes/Filters/Runtime.ini.in	2014-01-24 12:51:40 +0000
+++ test/gtest/scopes/Filters/Runtime.ini.in	2014-07-24 15:00:51 +0000
@@ -1,5 +1,5 @@
 [Runtime]
-Registry.Identity = Registry
+Registry.Identity = TestRegistry
 Registry.ConfigFile = Registry.ini
 Default.Middleware = Zmq
 Zmq.ConfigFile = Zmq.ini
 
=== modified file 'test/gtest/scopes/IdleShutdown/IdleShutdown_test.cpp'
--- test/gtest/scopes/IdleShutdown/IdleShutdown_test.cpp	2014-07-14 06:39:34 +0000
+++ test/gtest/scopes/IdleShutdown/IdleShutdown_test.cpp	2014-07-24 15:00:51 +0000
@@ -17,6 +17,7 @@
  */
 
 #include <unity/scopes/CategorisedResult.h>
+#include <unity/scopes/internal/RegistryObject.h>
 #include <unity/scopes/internal/RuntimeImpl.h>
 #include <unity/scopes/internal/ScopeImpl.h>
 
@@ -91,11 +92,24 @@
     EXPECT_TRUE(duration < chrono::seconds(6));
 }
 
+std::shared_ptr<core::posix::SignalTrap> trap(core::posix::trap_signals_for_all_subsequent_threads({core::posix::Signal::sig_chld}));
+std::unique_ptr<core::posix::ChildProcess::DeathObserver> death_observer(core::posix::ChildProcess::DeathObserver::create_once_with_signal_trap(trap));
+
+RuntimeImpl::SPtr run_test_registry()
+{
+    RuntimeImpl::SPtr runtime = RuntimeImpl::create("TestRegistry", "Runtime.ini");
+    MiddlewareBase::SPtr middleware = runtime->factory()->create("TestRegistry", "Zmq", "Zmq.ini");
+    RegistryObject::SPtr reg_obj(std::make_shared<RegistryObject>(*death_observer, std::make_shared<Executor>(), middleware));
+    middleware->add_registry_object("TestRegistry", reg_obj);
+    return runtime;
+}
+
 // Check that the idle timeout for a server waits for synchronous operations
 // to complete.
 
 TEST(IdleTimeout, server_idle_timeout_while_operation_in_progress)
 {
+    auto reg_rt = run_test_registry();
     auto start_time = chrono::steady_clock::now();
 
     {
 
=== modified file 'test/gtest/scopes/IdleShutdown/Runtime.ini.in'
--- test/gtest/scopes/IdleShutdown/Runtime.ini.in	2014-05-14 04:50:14 +0000
+++ test/gtest/scopes/IdleShutdown/Runtime.ini.in	2014-07-24 15:00:51 +0000
@@ -1,5 +1,5 @@
 [Runtime]
-Registry.Identity = Registry
+Registry.Identity = TestRegistry
 Registry.ConfigFile = Registry.ini
 Default.Middleware = Zmq
 Zmq.ConfigFile = Zmq.ini
 
=== modified file 'test/gtest/scopes/Invocation/Invocation_test.cpp'
--- test/gtest/scopes/Invocation/Invocation_test.cpp	2014-07-22 04:38:48 +0000
+++ test/gtest/scopes/Invocation/Invocation_test.cpp	2014-07-24 15:00:51 +0000
@@ -25,6 +25,7 @@
 #include <unity/scopes/ActionMetadata.h>
 #include <unity/scopes/CategorisedResult.h>
 #include <unity/scopes/internal/MWScope.h>
+#include <unity/scopes/internal/RegistryObject.h>
 #include <unity/scopes/internal/RuntimeImpl.h>
 #include <unity/scopes/internal/ScopeImpl.h>
 #include <unity/scopes/ListenerBase.h>
@@ -40,6 +41,7 @@
 
 using namespace std;
 using namespace unity::scopes;
+using namespace unity::scopes::internal;
 
 class TestReceiver : public SearchListenerBase
 {
@@ -89,12 +91,25 @@
     condition_variable cond_;
 };
 
+std::shared_ptr<core::posix::SignalTrap> trap(core::posix::trap_signals_for_all_subsequent_threads({core::posix::Signal::sig_chld}));
+std::unique_ptr<core::posix::ChildProcess::DeathObserver> death_observer(core::posix::ChildProcess::DeathObserver::create_once_with_signal_trap(trap));
+
+RuntimeImpl::SPtr run_test_registry()
+{
+    RuntimeImpl::SPtr runtime = RuntimeImpl::create("TestRegistry", "Runtime.ini");
+    MiddlewareBase::SPtr middleware = runtime->factory()->create("TestRegistry", "Zmq", "Zmq.ini");
+    RegistryObject::SPtr reg_obj(std::make_shared<RegistryObject>(*death_observer, std::make_shared<Executor>(), middleware));
+    middleware->add_registry_object("TestRegistry", reg_obj);
+    return runtime;
+}
+
 // Check that invoking on a scope after a timeout exception from a previous
 // invocation works correctly. This tests that a failed socket is removed
 // from the connection pool in ZmqObject::invoke_twoway_().
 
 TEST(Invocation, timeout)
 {
+    auto reg_rt = run_test_registry();
     auto rt = internal::RuntimeImpl::create("", "Runtime.ini");
     auto mw = rt->factory()->create("TestScope", "Zmq", "Zmq.ini");
     mw->start();
@@ -108,7 +123,7 @@
     receiver->wait_until_finished();
 
     EXPECT_EQ(ListenerBase::Error, receiver->reason());
-    EXPECT_EQ("unity::scopes::TimeoutException: Request timed out after 3000 milliseconds", receiver->error_message());
+    EXPECT_EQ("unity::scopes::TimeoutException: Request timed out after 500 milliseconds", receiver->error_message());
 
     // Wait another three seconds, so TestScope is finally able to receive another request.
     this_thread::sleep_for(chrono::seconds(3));
@@ -180,7 +195,7 @@
 
     // Give threads some time to bind to endpoints, to avoid getting ObjectNotExistException
     // from a synchronous remote call.
-    this_thread::sleep_for(chrono::milliseconds(200));
+    this_thread::sleep_for(chrono::milliseconds(500));
 
     auto rc = RUN_ALL_TESTS();
 
 
=== modified file 'test/gtest/scopes/Invocation/Runtime.ini.in'
--- test/gtest/scopes/Invocation/Runtime.ini.in	2014-04-17 01:36:29 +0000
+++ test/gtest/scopes/Invocation/Runtime.ini.in	2014-07-24 15:00:51 +0000
@@ -1,5 +1,5 @@
 [Runtime]
-Registry.Identity = Registry
+Registry.Identity = TestRegistry
 Registry.ConfigFile = Registry.ini
 Default.Middleware = Zmq
 Zmq.ConfigFile = Zmq.ini
 
=== modified file 'test/gtest/scopes/Invocation/TestScope.cpp'
--- test/gtest/scopes/Invocation/TestScope.cpp	2014-07-16 03:01:10 +0000
+++ test/gtest/scopes/Invocation/TestScope.cpp	2014-07-24 15:00:51 +0000
@@ -71,7 +71,7 @@
 
     if (count++ == 0)
     {
-        this_thread::sleep_for(chrono::milliseconds(4000));  // Force timeout on first call
+        this_thread::sleep_for(chrono::milliseconds(1000));  // Force timeout on first call
     }
     return SearchQueryBase::UPtr(new TestQuery(query, metadata));
 }
 
=== modified file 'test/gtest/scopes/Registry/CMakeLists.txt'
--- test/gtest/scopes/Registry/CMakeLists.txt	2014-07-15 05:50:10 +0000
+++ test/gtest/scopes/Registry/CMakeLists.txt	2014-07-24 15:00:51 +0000
@@ -8,6 +8,7 @@
 add_definitions(-DTEST_RUNTIME_PATH="${CMAKE_CURRENT_BINARY_DIR}")
 add_definitions(-DTEST_RUNTIME_FILE="${CMAKE_CURRENT_BINARY_DIR}/Runtime.ini")
 add_definitions(-DTEST_REGISTRY_PATH="${PROJECT_BINARY_DIR}/scoperegistry")
+add_definitions(-DTEST_SCOPE_A_PATH="${CMAKE_CURRENT_BINARY_DIR}/scopes/testscopeA")
 
 add_executable(Registry_test Registry_test.cpp)
 target_link_libraries(Registry_test ${TESTLIBS})
 
=== modified file 'test/gtest/scopes/Registry/Registry_test.cpp'
--- test/gtest/scopes/Registry/Registry_test.cpp	2014-07-23 14:12:45 +0000
+++ test/gtest/scopes/Registry/Registry_test.cpp	2014-07-24 15:00:51 +0000
@@ -86,7 +86,7 @@
     EXPECT_EQ("scope-A.DisplayName", meta.display_name());
     EXPECT_EQ("scope-A.Description", meta.description());
     EXPECT_EQ("/foo/scope-A.Art", meta.art());
-    EXPECT_EQ("/foo/scope-A.Icon", meta.icon());
+    EXPECT_EQ("file://scope-A.Icon", meta.icon());
     EXPECT_EQ("scope-A.HotKey", meta.hot_key());
     EXPECT_FALSE(meta.invisible());
     EXPECT_EQ("scope-A.SearchHint", meta.search_hint());
@@ -103,14 +103,14 @@
     EXPECT_EQ("fg_color", attrs["foreground-color"].get_string());
     EXPECT_EQ("bg_color", attrs["background-color"].get_string());
     EXPECT_TRUE(attrs["shape-images"].get_bool());
-    EXPECT_EQ("cat_header_bg_scheme", attrs["category-header-background"].get_string());
+    EXPECT_EQ(TEST_SCOPE_A_PATH "/cat_header_bg_scheme", attrs["category-header-background"].get_string());
     EXPECT_EQ("preview_button_color", attrs["preview-button-color"].get_string());
     EXPECT_EQ("overlay_color", attrs["logo-overlay-color"].get_string());
     auto page_hdr = attrs["page-header"].get_dict();
-    EXPECT_EQ("some_url", page_hdr["logo"].get_string());
+    EXPECT_EQ(TEST_SCOPE_A_PATH "/some_url", page_hdr["logo"].get_string());
     EXPECT_EQ("fg_color", page_hdr["foreground-color"].get_string());
     EXPECT_EQ("div_color", page_hdr["divider-color"].get_string());
-    EXPECT_EQ("nav_background", page_hdr["navigation-background"].get_string());
+    EXPECT_EQ("http://nav_background", page_hdr["navigation-background"].get_string());
 
     const char *bart = TEST_RUNTIME_PATH "/scopes/testscopeB/data/scope-B.Art";
     const char *bicon = TEST_RUNTIME_PATH "/scopes/testscopeB/data/scope-B.Icon";
 
=== modified file 'test/gtest/scopes/Registry/scopes/testscopeA/testscopeA.ini.in'
--- test/gtest/scopes/Registry/scopes/testscopeA/testscopeA.ini.in	2014-07-22 10:38:18 +0000
+++ test/gtest/scopes/Registry/scopes/testscopeA/testscopeA.ini.in	2014-07-24 15:00:51 +0000
@@ -3,7 +3,7 @@
 Description = scope-A.Description
 Art = /foo/scope-A.Art
 Author = Canonical Ltd.
-Icon = /foo/scope-A.Icon
+Icon = file://scope-A.Icon
 SearchHint = scope-A.SearchHint
 HotKey = scope-A.HotKey
 LocationDataNeeded = true
@@ -19,4 +19,4 @@
 PageHeader.ForegroundColor = fg_color
 PageHeader.Background = bg_scheme
 PageHeader.DividerColor = div_color
-PageHeader.NavigationBackground = nav_background
+PageHeader.NavigationBackground = http://nav_background
 
=== modified file 'test/gtest/scopes/Runtime/Runtime.ini.in'
--- test/gtest/scopes/Runtime/Runtime.ini.in	2013-12-13 11:25:44 +0000
+++ test/gtest/scopes/Runtime/Runtime.ini.in	2014-07-24 15:00:51 +0000
@@ -1,5 +1,5 @@
 [Runtime]
-Registry.Identity = Registry
+Registry.Identity = TestRegistry
 Registry.ConfigFile = Registry.ini
 Default.Middleware = Zmq
 Zmq.ConfigFile = Zmq.ini
 
=== modified file 'test/gtest/scopes/Runtime/Runtime_test.cpp'
--- test/gtest/scopes/Runtime/Runtime_test.cpp	2014-07-17 05:02:03 +0000
+++ test/gtest/scopes/Runtime/Runtime_test.cpp	2014-07-24 15:00:51 +0000
@@ -25,6 +25,7 @@
 #include <unity/scopes/ActionMetadata.h>
 #include <unity/scopes/CategorisedResult.h>
 #include <unity/scopes/internal/MWScope.h>
+#include <unity/scopes/internal/RegistryObject.h>
 #include <unity/scopes/internal/RuntimeImpl.h>
 #include <unity/scopes/internal/ScopeImpl.h>
 #include <unity/scopes/ListenerBase.h>
@@ -41,6 +42,7 @@
 
 using namespace std;
 using namespace unity::scopes;
+using namespace unity::scopes::internal;
 
 TEST(Runtime, basic)
 {
@@ -221,8 +223,22 @@
     atomic_int count_;
 };
 
+std::shared_ptr<core::posix::SignalTrap> trap(core::posix::trap_signals_for_all_subsequent_threads({core::posix::Signal::sig_chld}));
+std::unique_ptr<core::posix::ChildProcess::DeathObserver> death_observer(core::posix::ChildProcess::DeathObserver::create_once_with_signal_trap(trap));
+
+RuntimeImpl::SPtr run_test_registry()
+{
+    RuntimeImpl::SPtr runtime = RuntimeImpl::create("TestRegistry", "Runtime.ini");
+    MiddlewareBase::SPtr middleware = runtime->factory()->create("TestRegistry", "Zmq", "Zmq.ini");
+    RegistryObject::SPtr reg_obj(std::make_shared<RegistryObject>(*death_observer, std::make_shared<Executor>(), middleware));
+    middleware->add_registry_object("TestRegistry", reg_obj);
+    return runtime;
+}
+
 TEST(Runtime, search)
 {
+    auto reg_rt = run_test_registry();
+
     // connect to scope and run a query
     auto rt = internal::RuntimeImpl::create("", "Runtime.ini");
     auto mw = rt->factory()->create("TestScope", "Zmq", "Zmq.ini");
@@ -237,6 +253,7 @@
 
 TEST(Runtime, consecutive_search)
 {
+    auto reg_rt = run_test_registry();
     auto rt = internal::RuntimeImpl::create("", "Runtime.ini");
     auto mw = rt->factory()->create("TestScope", "Zmq", "Zmq.ini");
     mw->start();
@@ -278,6 +295,8 @@
 
 TEST(Runtime, preview)
 {
+    auto reg_rt = run_test_registry();
+
     // connect to scope and run a query
     auto rt = internal::RuntimeImpl::create("", "Runtime.ini");
     auto mw = rt->factory()->create("TestScope", "Zmq", "Zmq.ini");
@@ -303,6 +322,8 @@
 
 TEST(Runtime, cardinality)
 {
+    auto reg_rt = run_test_registry();
+
     // connect to scope and run a query
     auto rt = internal::RuntimeImpl::create("", "Runtime.ini");
     auto mw = rt->factory()->create("PusherScope", "Zmq", "Zmq.ini");
@@ -360,6 +381,7 @@
 
 TEST(Runtime, early_cancel)
 {
+    auto reg_rt = run_test_registry();
     auto rt = internal::RuntimeImpl::create("", "Runtime.ini");
     auto mw = rt->factory()->create("SlowCreateScope", "Zmq", "Zmq.ini");
     mw->start();
 
=== modified file 'test/gtest/scopes/internal/smartscopes/smartscopesproxy/smartscopesproxy_test.cpp'
--- test/gtest/scopes/internal/smartscopes/smartscopesproxy/smartscopesproxy_test.cpp	2014-07-07 23:53:36 +0000
+++ test/gtest/scopes/internal/smartscopes/smartscopesproxy/smartscopesproxy_test.cpp	2014-07-24 15:00:51 +0000
@@ -108,8 +108,9 @@
 
 TEST_F(smartscopesproxytest, ss_registry)
 {
-    // locate should throw (direct)
-    EXPECT_THROW(reg_->locate("dummy.scope"), RegistryException);
+    // non-existent scope (direct)
+    EXPECT_THROW(reg_->get_metadata("dummy.scope.5"), NotFoundException);
+    EXPECT_THROW(reg_->locate("dummy.scope.5"), NotFoundException);
 
     // list scopes (direct)
     MetadataMap scopes = reg_->list();
@@ -139,12 +140,10 @@
     EXPECT_EQ("Celsius", meta.settings_definitions()[1].get_dict()["values"].get_array()[0].get_string());
     EXPECT_EQ("Fahrenheit", meta.settings_definitions()[1].get_dict()["values"].get_array()[1].get_string());
 
-    // non-existant scope (direct)
-    EXPECT_THROW(reg_->get_metadata("dummy.scope.5"), NotFoundException);
-
-    // locate should throw (via mw)
+    // non-existent scope (via mw)
     MWRegistryProxy mw_reg = mw_->registry_proxy();
-    EXPECT_THROW(mw_reg->locate("Dummy Demo Scope"), RegistryException);
+    EXPECT_THROW(mw_reg->get_metadata("dummy.scope.5"), NotFoundException);
+    EXPECT_THROW(mw_reg->locate("dummy.scope.5"), NotFoundException);
 
     // list scopes (via mw)
     scopes = mw_reg->list();
@@ -173,9 +172,6 @@
     EXPECT_EQ(2, meta.settings_definitions()[1].get_dict()["values"].get_array().size());
     EXPECT_EQ("Celsius", meta.settings_definitions()[1].get_dict()["values"].get_array()[0].get_string());
     EXPECT_EQ("Fahrenheit", meta.settings_definitions()[1].get_dict()["values"].get_array()[1].get_string());
-
-    // non-existant scope (via mw)
-    EXPECT_THROW(mw_reg->get_metadata("dummy.scope.5"), NotFoundException);
 }
 
 TEST_F(smartscopesproxytest, ss_registry_locale)
 
=== modified file 'test/gtest/scopes/internal/zmq_middleware/RegistryI/RegistryI_test.cpp'
--- test/gtest/scopes/internal/zmq_middleware/RegistryI/RegistryI_test.cpp	2014-07-22 04:46:56 +0000
+++ test/gtest/scopes/internal/zmq_middleware/RegistryI/RegistryI_test.cpp	2014-07-24 15:00:51 +0000
@@ -370,10 +370,10 @@
     }
 }
 
-class RegistryTest : public Test
+class RegistryITest : public Test
 {
 public:
-    RegistryTest()
+    RegistryITest()
     {
         start_process_count = process_count();
 
@@ -419,7 +419,7 @@
         }
     }
 
-    ~RegistryTest()
+    ~RegistryITest()
     {
         // tear down the registry
         reg.reset();
@@ -506,7 +506,7 @@
 };
 
 // test initial state
-TEST_F(RegistryTest, locate_init)
+TEST_F(RegistryITest, locate_init)
 {
     // check that no scope processes are running
     for (auto const& scope_id : scope_ids)
@@ -519,7 +519,7 @@
 }
 
 // test locating the same scope multiple times
-TEST_F(RegistryTest, locate_one)
+TEST_F(RegistryITest, locate_one)
 {
     // locate all scopes (hence starting all scope processes)
     for (auto const& scope_id : scope_ids)
@@ -541,7 +541,7 @@
 }
 
 // test locating all scopes
-TEST_F(RegistryTest, locate_all)
+TEST_F(RegistryITest, locate_all)
 {
     // locate all scopes (hence starting all scope processes)
     for (auto const& scope_id : scope_ids)
@@ -585,7 +585,7 @@
 };
 
 // test scope death and rebinding
-TEST_F(RegistryTest, locate_rebinding)
+TEST_F(RegistryITest, locate_rebinding)
 {
     // locate first scope
     EXPECT_EQ(proxies[scope_ids[0]], reg->locate(scope_ids[0]));
@@ -622,7 +622,7 @@
 }
 
 // test removing a scope
-TEST_F(RegistryTest, locate_remove)
+TEST_F(RegistryITest, locate_remove)
 {
     // locate all scopes (hence starting all scope processes)
     for (auto const& scope_id : scope_ids)
@@ -649,7 +649,7 @@
 }
 
 // test custom scoperunner executable
-TEST_F(RegistryTest, locate_custom_exec)
+TEST_F(RegistryITest, locate_custom_exec)
 {
     ScopeProxy test_proxy = start_testscopeB();
 
@@ -680,7 +680,7 @@
 }
 
 // test idle timeout of a scope
-TEST_F(RegistryTest, locate_idle_timeout)
+TEST_F(RegistryITest, locate_idle_timeout)
 {
     ScopeProxy test_proxy = start_testscopeB();