Merge lp:~unity-api-team/unity-scope-click/wait-for-add into lp:unity-scope-click

[Pete Woods]

Wait for add request completion

Wait for add request completion

[lp:~unity-api-team/unity-scope-click/wait-for-add]

305. By Pete Woods on 2015-01-13

Set the wait condition in more places

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:304
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/559/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/387/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-vivid-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-vivid-armhf-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-vivid-armhf-ci/15/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/394/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/559/rebuild

review: Approve (continuous-integration)

[lp:~unity-api-team/unity-scope-click/wait-for-add]

306. By Pete Woods on 2015-01-13

Make it compile

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:306
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/560/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/388
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-vivid-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-vivid-armhf-ci/16
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-vivid-armhf-ci/16/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/318
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/396
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/396/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/560/rebuild

review: Approve (continuous-integration)

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:306
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scope-click-ci/1/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/88/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/95/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scope-click-ci/1/rebuild

review: Needs Fixing (continuous-integration)

[dobey (dobey)]

This is extremely old and conflicts with trunk so I set it to WIP.

Unmerged revisions

306. By Pete Woods on 2015-01-13

Make it compile

305. By Pete Woods on 2015-01-13

Set the wait condition in more places

304. By Pete Woods on 2015-01-13

Wait for add_available_apps call to finish

=== modified file 'scope/clickstore/store-query.cpp'
--- scope/clickstore/store-query.cpp	2014-12-04 11:53:36 +0000
+++ scope/clickstore/store-query.cpp	2015-01-13 16:48:02 +0000
@@ -462,9 +462,12 @@
     // this pointer is never null during normal execution.
     assert(searchReply);
 
-    run_under_qt([=]()
+    std::promise<bool> dummy_promise;
+    std::future<bool> dummy_future = dummy_promise.get_future();
+
+    run_under_qt([=, &dummy_promise]()
     {
-        auto search_cb = [this, searchReply, categoryTemplate, installedPackages](Packages packages, Packages recommends) {
+        auto search_cb = [this, searchReply, categoryTemplate, installedPackages, &dummy_promise](Packages packages, Packages recommends) {
                 qDebug("search callback");
 
                 const scopes::CategoryRenderer categoryRenderer(categoryTemplate);
@@ -498,13 +501,15 @@
                 }
                 qDebug() << "search completed";
                 this->finished(searchReply); //FIXME: this shouldn't be needed
+
+                dummy_promise.set_value(true);
             };
 
             // this is the case when we do bootstrap for the first time, or it failed last time
             if (impl->department_lookup.size() == 0)
             {
                 qDebug() << "performing bootstrap request";
-                impl->search_operation = impl->index.bootstrap([this, search_cb, searchReply, installedPackages](const DepartmentList& deps, const
+                impl->search_operation = impl->index.bootstrap([this, search_cb, searchReply, installedPackages, &dummy_promise](const DepartmentList& deps, const
                             HighlightList& highlights, click::Index::Error error, int) {
                 if (error == click::Index::Error::NoError)
                 {
@@ -536,6 +541,7 @@
                     if (query().query_string().empty())
                     {
                         add_highlights(searchReply, installedPackages);
+                        dummy_promise.set_value(true);
                     }
                     else
                     {
@@ -550,6 +556,7 @@
             if (query().query_string().empty())
             {
                 add_highlights(searchReply, installedPackages);
+                dummy_promise.set_value(true);
             }
             else // normal search
             {
@@ -558,6 +565,8 @@
             }
         }
     });
+
+    dummy_future.get();
 }
 
 PackageSet click::Query::get_installed_packages()