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

[Marcus Tomlinson]

Added valgrind suppressions to ignore false positives for memory leaks in Qt.
Fixed possible deadlock in smartscopesproxy_test.

Unmerged revisions

=== modified file 'include/unity/scopes/internal/smartscopes/SSRegistryObject.h'
--- include/unity/scopes/internal/smartscopes/SSRegistryObject.h	2014-01-30 05:45:52 +0000
+++ include/unity/scopes/internal/smartscopes/SSRegistryObject.h	2014-02-03 11:42:22 +0000
@@ -43,7 +43,8 @@
     UNITY_DEFINES_PTRS(SSRegistryObject);
 
     SSRegistryObject(MiddlewareBase::SPtr middleware, std::string const& ss_scope_endpoint,
-                     uint max_http_sessions, uint no_reply_timeout, uint refresh_rate_in_min);
+                     uint max_http_sessions, uint no_reply_timeout, uint refresh_rate_in_min,
+                     std::string const& sss_url = "" /*detect url*/, uint sss_port = 80);
     virtual ~SSRegistryObject() noexcept;
 
     ScopeMetadata get_metadata(std::string const& scope_name) override;

=== modified file 'src/scopes/internal/smartscopes/SSRegistryObject.cpp'
--- src/scopes/internal/smartscopes/SSRegistryObject.cpp	2014-01-30 06:07:44 +0000
+++ src/scopes/internal/smartscopes/SSRegistryObject.cpp	2014-02-03 11:42:22 +0000
@@ -42,10 +42,12 @@
                                    std::string const& ss_scope_endpoint,
                                    uint max_http_sessions,
                                    uint no_reply_timeout,
-                                   uint refresh_rate_in_min)
+                                   uint refresh_rate_in_min,
+                                   std::string const& sss_url,
+                                   uint sss_port)
     : ssclient_(std::make_shared<SmartScopesClient>(
                     std::make_shared<HttpClientQt>(max_http_sessions, no_reply_timeout),
-                    std::make_shared<JsonCppNode>()))
+                    std::make_shared<JsonCppNode>(), sss_url, sss_port))
     , refresh_stopped_(false)
     , middleware_(middleware)
     , ss_scope_endpoint_(ss_scope_endpoint)

=== modified file 'test/gtest/scopes/internal/smartscopes/smartscopesproxy/smartscopesproxy_test.cpp'
--- test/gtest/scopes/internal/smartscopes/smartscopesproxy/smartscopesproxy_test.cpp	2014-01-30 09:56:21 +0000
+++ test/gtest/scopes/internal/smartscopes/smartscopesproxy/smartscopesproxy_test.cpp	2014-02-03 11:42:22 +0000
@@ -52,9 +52,6 @@
         , reg_id_("SSRegistry")
         , scope_id_("SmartScope")
     {
-        std::string server_env = "SMART_SCOPES_SERVER=http://127.0.0.1:" + std::to_string(server_.port_);
-        ::putenv((char*)server_env.c_str());
-
         // Instantiate SS registry and scopes runtimes
         reg_rt_ = RuntimeImpl::create(reg_id_, SS_RUNTIME_PATH);
         scope_rt_ = RuntimeImpl::create(scope_id_, SS_RUNTIME_PATH);
@@ -69,7 +66,8 @@
         scope_mw_ = scope_rt_->factory()->create(scope_id_, mw_kind, mw_configfile);
 
         // Instantiate a SS registry and scope objects
-        reg_ = SSRegistryObject::SPtr(new SSRegistryObject(reg_mw_, scope_mw_->get_scope_endpoint(), 2, 2000, 60));
+        reg_ = SSRegistryObject::SPtr(new SSRegistryObject(reg_mw_, scope_mw_->get_scope_endpoint(), 2, 2000, 60,
+                                                           "http://127.0.0.1", server_.port_));
         scope_ = SSScopeObject::UPtr(new SSScopeObject(scope_id_, scope_mw_, reg_));
 
         // Add objects to the middlewares
@@ -199,8 +197,12 @@
     auto reply = std::make_shared<Receiver>();
 
     ScopeMetadata meta = reg_->get_metadata("Dummy Demo Scope");
+
+    auto wait_thread = std::thread([&reply](){reply->wait_until_finished();});
+
     meta.proxy()->create_query("search_string", VariantMap(), reply);
-    reply->wait_until_finished();
+
+    wait_thread.join();
 }
 
 } // namespace

=== modified file 'valgrind-suppress'
--- valgrind-suppress	2014-01-27 11:31:02 +0000
+++ valgrind-suppress	2014-02-03 11:42:22 +0000
@@ -76,7 +76,7 @@
 # False positives for memory leaks in Qt
 
 {
-   QNetworkConfigurationManagerInit
+   QNetworkConfigurationManager
    Memcheck:Leak
    fun:*alloc
    ...
@@ -85,10 +85,27 @@
 }
 
 {
-   QCoreApplicationNotifyRealloc
+   QCoreApplication
    Memcheck:Leak
    fun:realloc
    ...
    fun:_ZN7QObject5eventEP6QEvent
    fun:_ZN16QCoreApplication6notifyEP7QObjectP6QEvent
 }
+
+{
+   QNetworkAccessManager
+   Memcheck:Leak
+   ...
+   fun:_ZN21QNetworkAccessManager13createRequestENS_9OperationERK15QNetworkRequestP9QIODevice
+   fun:_ZN21QNetworkAccessManager3getERK15QNetworkRequest
+   fun:_ZN18HttpClientQtThread3runEv
+}
+
+{
+   QFactoryLoader
+   Memcheck:Leak
+   fun:*alloc
+   ...
+   fun:_ZNK14QFactoryLoader8instanceEi
+}