Merge lp:unity-scopes-api/staging into lp:unity-scopes-api

[Marcus Tomlinson]

* Deprecated push(Filters const&, FilterState const&) method.
* Fixed potential login deadlock in OnlineAccountClient.
* Increased upper timeout limits to 60s to assist scope-harness testing on slow builders.
* Fixes for building with Florian Boucault's crossbuilder.
* Fixed incorrect generation of shlib files.
* Fixed Yakkety build by adding missing #includes.
* Fixed arm64 build by temporarily disabling SmartScopesClient_test.

[Michi Henning (michihenning)]

Would be nice to get rid of this warning:

/home/michi/src/unity-scopes-api/staging/RELEASE_NOTES.md:11: warning: explicit link request to 'includes' could not be resolved

Also, could we include https://code.launchpad.net/~michihenning/unity-scopes-api/shlib-fix/+merge/305297

This will be needed for the MIR.

[lp:unity-scopes-api/staging]

331. By Marcus Tomlinson on 2016-09-09

Merged devel

332. By Marcus Tomlinson on 2016-09-09

Update RELEASE_NOTES.md

[James Henstridge (jamesh)]

Looks good.

review: Approve

=== modified file 'CONFIGFILES'
--- CONFIGFILES	2016-02-22 01:29:01 +0000
+++ CONFIGFILES	2016-09-09 12:41:03 +0000
@@ -189,11 +189,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 15000 milliseconds are accepted. (Values outside
+  Only values in the range 10 to 60000 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.)
 
-  Only values in the range 10 to 15000 milliseconds are accepted.
+  Only values in the range 10 to 60000 milliseconds are accepted.
 
   The default value is 5000 milliseconds.
 
@@ -202,7 +202,7 @@
   The timeout to be used when invoking a twoway operation on the registry other
   than locate().
 
-  Only values in the range 10 to 15000 milliseconds are accepted.
+  Only values in the range 10 to 60000 milliseconds are accepted.
 
   The default value is 5000 milliseconds.
 
@@ -212,7 +212,7 @@
   on a scope. These methods require more time to execute than other scope methods
   as they read from and write to disk.
 
-  Only values in the range 10 to 15000 milliseconds are accepted.
+  Only values in the range 10 to 60000 milliseconds are accepted.
 
   The default value is 2000 milliseconds.
 
@@ -269,7 +269,7 @@
   or terminate correctly. If a scope does not respond
   within the allotted time, it is killed with SIGKILL.
 
-  Only values in the range 10 to 15000 milliseconds are accepted.
+  Only values in the range 10 to 60000 milliseconds are accepted.
 
   The default value is 4000 milliseconds.
 

=== modified file 'HACKING'
--- HACKING	2016-03-31 23:48:56 +0000
+++ HACKING	2016-09-09 12:41:03 +0000
@@ -182,41 +182,6 @@
     #endif
 #endif
 
-Updating symbols files (only for Vivid)
----------------------------------------
-
-On Vivid only, we maintain symbols files, using the gcc 4.9 ABI names.
-On Wily, there is no symbols file because we don't care whether we
-use the gcc 4.9 or 5.x ABI. (The code is the same either way.) Instead,
-we use a shlibs file.
-
-For Vivid, the symbols files are generated from debian/libunity-scopes.symbols.in
-and debian/libunity-scopes-qt.symbols.in. (The soversion is substituted
-automatically into the files.)
-
-To easily spot new/removed/changed symbols in the library, the debian
-package maintains a .symbols file that lists all exported symbols
-present in a library .so. If you add new public symbols to the library,
-it's necessary to refresh the symbols file, otherwise the package will
-fail to build. The easiest way to do that is using bzr-builddeb:
-
-    $ bzr bd -- -us -uc -j8  # Don't sign source package or changes file, 8 compiles in parallel
-    $ # this will exit with an error if symbols file isn't up-to-date
-    $ cd ../build-area/unity-scopes-api-[version]
-    $ ./obj-[arch]/tools/symbol_diff
-
-This creates a diff of the symbols in /tmp/symbols.diff.
-(The demangled symbols from the debian build are in ./new_symbols.)
-
-Review any changes in /tmp/symbols.diff. If they are OK:
-
-    $ cd -
-    $ patch -p0 debian/libunity-scopes.symbols.in < /tmp/symbols.diff
-
-For changes in the qt library symbols file, use
-
-    $ patch -p0 debian/libunity-scopes-qt.symbols.in < /tmp/symbols.diff
-
 ABI compatibility
 -----------------
 
@@ -251,15 +216,25 @@
     if the soname of the Qt library changes, in which case
     bileto_pre_release_hook needs a corresponding update.
 
-The version files have the format
+  - LAST_ABI_ADDITION_VERSION
+
+    The micro version at which we last added something
+    new to the libunity-scopes ABI (without breaking anything).
+
+  - LAST_ABI_ADDITION_QT-VERSION
+
+    The micro version at which we last added something
+    new to the libunity-scopes-qt ABI (without breaking anything).
+
+  The version files have the format
 
     <major>.<minor>.<micro>
 
-All three numbers must be present.
+  All three numbers must be present.
 
-The soversion for each library is derived from the corresponding
-version file so, unless the soversion changes, you don't need to
-do anything special.
+  The soversion for each library is derived from the corresponding
+  version file so, unless the soversion changes, you don't need to
+  do anything special.
 
 Versioning rules:
     
@@ -269,6 +244,13 @@
 is in this build or not.) The best time to update the micro
 version is when creating a silo for landing in the archives.
 
+For changes in behavior that do *not* add anything new to the ABI, you must
+increment the micro version in VERSION or QT-VERSION, but *not* the
+version in LAST_ABI_ADDITION_VERSION or LAST_ABI_ADDITION_QT-VERSION.
+For changes that add something to the ABI (without breaking it), you *must*
+increment *both* VERSION and LAST_ABI_ADDITION_VERSION (or
+QT-VERSION and LAST_ABI_ADDITION_QT-VERSION).
+
 For ABI incompatible changes, either minor or major must be
 incremented, and the lower-order version numbers must be reset to zero.
 

=== modified file 'RELEASE_NOTES.md'
--- RELEASE_NOTES.md	2016-05-23 07:55:39 +0000
+++ RELEASE_NOTES.md	2016-09-09 12:41:03 +0000
@@ -1,6 +1,17 @@
 Release notes
 =============
 
+Changes in version 1.0.7
+========================
+  - Fixed potential login deadlock in OnlineAccountClient.
+  - Increased upper timeout limits to 60s to assist scope-harness testing on slow builders.
+  - Fixes for building with Florian Boucault's crossbuilder.
+  - Fixed incorrect generation of shlib files.
+  - Marked the push(Filters const&, FilterState const&) method of SearchReply and SearchListenerBase
+    as deprecated and provided push methods which take the Filters argument only.
+  - Fixed Yakkety build by adding missing #includes
+  - Fixed arm64 build by temporarily disabling SmartScopesClient_test
+
 Changes in version 1.0.6
 ========================
   - Got rid of category header background, as per design (Bug #1446216).

=== modified file 'STRUCTS'
--- STRUCTS	2016-02-25 16:26:09 +0000
+++ STRUCTS	2016-09-09 12:41:03 +0000
@@ -142,10 +142,9 @@
  'central_label'       : string
  'filter_group' : string, optional
 
-Filters + FilterState
-=====================
+Filters
+=======
  'filter'       : array of filters (implementations of FilterBase)
- 'filter_state' : FilterState
 
 PreviewResult (returned by serialize())
 =======================================

=== added file 'debian/LAST_ABI_ADDITION_QT-VERSION'
--- debian/LAST_ABI_ADDITION_QT-VERSION	1970-01-01 00:00:00 +0000
+++ debian/LAST_ABI_ADDITION_QT-VERSION	2016-09-09 12:41:03 +0000
@@ -0,0 +1,1 @@
+0.6.15

=== added file 'debian/LAST_ABI_ADDITION_VERSION'
--- debian/LAST_ABI_ADDITION_VERSION	1970-01-01 00:00:00 +0000
+++ debian/LAST_ABI_ADDITION_VERSION	2016-09-09 12:41:03 +0000
@@ -0,0 +1,1 @@
+1.0.7

=== modified file 'debian/VERSION'
--- debian/VERSION	2016-05-23 07:56:41 +0000
+++ debian/VERSION	2016-09-09 12:41:03 +0000
@@ -1,1 +1,1 @@
-1.0.6
+1.0.7

=== modified file 'debian/bileto_pre_release_hook'
--- debian/bileto_pre_release_hook	2016-03-31 23:48:56 +0000
+++ debian/bileto_pre_release_hook	2016-09-09 12:41:03 +0000
@@ -80,6 +80,10 @@
 [ -n "$UNITY_SCOPES_SOVERSION" ]
 [ -n "$UNITY_SCOPES_QT_SOVERSION" ]
 
+export LAST_ABI_ADDITION_VERSION=$(cat "$dir/LAST_ABI_ADDITION_VERSION")
+export LAST_ABI_ADDITION_QT_VERSION=$(cat "$dir/LAST_ABI_ADDITION_QT-VERSION")
+[ -n "$LAST_ABI_ADDITION_VERSION" ]
+[ -n "$LAST_ABI_ADDITION_QT_VERSION" ]
 
 process()
 {
@@ -106,7 +110,7 @@
         "$dir/control"
 }
 
-# Generate the install files, naming them according to the soversion.
+# Generate the install files.
 
 # Install file for binary package
 process "$dir/libunity-scopes.install.in" \
@@ -118,10 +122,11 @@
 
 # Shlibs file
 process "$dir/libunity-scopes.shlibs.in" \
-    >"$dir/libunity-scopes-${UNITY_SCOPES_FULL_VERSION}.shlibs"
+    >"$dir/libunity-scopes-${UNITY_SCOPES_MAJOR_MINOR}.shlibs"
 
+# Shlibs file for qt
 process "$dir/libunity-scopes-qt.shlibs.in" \
-    >"$dir/libunity-scopes-qt${UNITY_SCOPES_QT_FULL_VERSION}.shlibs"
+    >"$dir/libunity-scopes-qt${UNITY_SCOPES_QT_MAJOR_MINOR}.shlibs"
 
 # Install file for qt binary package
 process "$dir/libunity-scopes-qt.install.in" \

=== modified file 'debian/changelog'
--- debian/changelog	2016-06-17 07:27:25 +0000
+++ debian/changelog	2016-09-09 12:41:03 +0000
@@ -1,3 +1,22 @@
+unity-scopes-api (1.0.7-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Marcus Tomlinson ]
+  * Fixed potential login deadlock in OnlineAccountClient.
+  * Increased upper timeout limits to 60s to assist scope-harness testing on slow builders.
+
+  [ Michi Henning ]
+  * Fixes for building with Florian Boucault's crossbuilder.
+  * Fix for bug #1548718: Need to update micro version in shlibs file when symbols are added
+
+  [ Pawel Stolowski ]
+  * Marked the push(Filters const&, FilterState const&) method of SearchReply
+    and SearchListenerBase as deprecated and provided push methods which take
+    the Filters argument only.
+  * Fixed Yakkety build by adding missing #includes
+  * Fixed arm64 build by temporarily disabling SmartScopesClient_test
+
+ -- Pawel Stolowski <[e-mail]>  Tue, 28 Jun 2016 10:11:22 +0200
+
 unity-scopes-api (1.0.6+16.10.20160617-0ubuntu1) yakkety; urgency=medium
 
   [ Marcus Tomlinson ]

=== modified file 'debian/control'
--- debian/control	2016-06-17 07:27:25 +0000
+++ debian/control	2016-09-09 12:41:03 +0000
@@ -6,8 +6,8 @@
 Source: unity-scopes-api
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
-Build-Depends: abigail-tools | libabigail-tools,
-               binutils,
+Build-Depends: abigail-tools <!nocheck> | libabigail-tools <!nocheck>,
+               binutils:native,
                capnproto,
                click-dev (>= 0.2.2),
                cmake,
@@ -37,9 +37,9 @@
                lsb-release,
                lttng-tools,
                pkg-config,
-               python3:any,
-               python3-dbusmock,
-               python-tornado,
+               python3 <!nocheck>,
+               python3-dbusmock <!nocheck>,
+               python-tornado <!nocheck>,
                valgrind,
 Standards-Version: 3.9.6
 XS-Testsuite: autopkgtest

=== modified file 'debian/control.in'
--- debian/control.in	2016-04-06 23:27:51 +0000
+++ debian/control.in	2016-09-09 12:41:03 +0000
@@ -1,8 +1,8 @@
 Source: unity-scopes-api
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
-Build-Depends: abigail-tools | libabigail-tools,
-               binutils,
+Build-Depends: abigail-tools <!nocheck> | libabigail-tools <!nocheck>,
+               binutils:native,
                capnproto,
                click-dev (>= 0.2.2),
                cmake,
@@ -32,9 +32,9 @@
                lsb-release,
                lttng-tools,
                pkg-config,
-               python3:any,
-               python3-dbusmock,
-               python-tornado,
+               python3 <!nocheck>,
+               python3-dbusmock <!nocheck>,
+               python-tornado <!nocheck>,
                valgrind,
 Standards-Version: 3.9.6
 XS-Testsuite: autopkgtest

=== modified file 'debian/libunity-scopes-qt.shlibs.in'
--- debian/libunity-scopes-qt.shlibs.in	2015-09-23 05:44:42 +0000
+++ debian/libunity-scopes-qt.shlibs.in	2016-09-09 12:41:03 +0000
@@ -1,1 +1,1 @@
-libunity-scopes-qt @UNITY_SCOPES_QT_SOVERSION@ libunity-scopes-qt@UNITY_SCOPES_QT_SOVERSION@ (>= @UNITY_SCOPES_QT_MAJOR_MINOR@)
+libunity-scopes-qt @UNITY_SCOPES_QT_SOVERSION@ libunity-scopes-qt@UNITY_SCOPES_QT_SOVERSION@ (>= @LAST_ABI_ADDITION_QT_VERSION@)

=== modified file 'debian/libunity-scopes.shlibs.in'
--- debian/libunity-scopes.shlibs.in	2015-09-23 05:44:42 +0000
+++ debian/libunity-scopes.shlibs.in	2016-09-09 12:41:03 +0000
@@ -1,1 +1,1 @@
-libunity-scopes @UNITY_SCOPES_SOVERSION@ libunity-scopes@UNITY_SCOPES_SOVERSION@ (>= @UNITY_SCOPES_MAJOR_MINOR@)
+libunity-scopes @UNITY_SCOPES_SOVERSION@ libunity-scopes@UNITY_SCOPES_SOVERSION@ (>= @LAST_ABI_ADDITION_VERSION@)

=== modified file 'debian/source/format'
--- debian/source/format	2015-09-08 02:29:27 +0000
+++ debian/source/format	2016-09-09 12:41:03 +0000
@@ -1,1 +1,1 @@
-3.0 (quilt)
+3.0 (native)

=== modified file 'include/unity/scopes/SearchListenerBase.h'
--- include/unity/scopes/SearchListenerBase.h	2015-09-01 22:19:45 +0000
+++ include/unity/scopes/SearchListenerBase.h	2016-09-09 12:41:03 +0000
@@ -96,10 +96,19 @@
     /**
     \brief Called once by the scopes to send all the filters and their state.
 
+    \deprecated Please override the push(Filters& const) method instead. This method will be removed from future releases.
+
     The default implementation does nothing.
     */
     virtual void push(Filters const& filters, FilterState const& filter_state);
 
+    /**
+    \brief Called once by the scope to send all filters and their states.
+
+    The default implementation does nothing.
+    */
+    virtual void push(Filters const& filters);
+
 protected:
     /// @cond
     SearchListenerBase();

=== modified file 'include/unity/scopes/SearchReply.h'
--- include/unity/scopes/SearchReply.h	2015-10-29 02:35:50 +0000
+++ include/unity/scopes/SearchReply.h	2016-09-09 12:41:03 +0000
@@ -139,7 +139,8 @@
     virtual bool push(experimental::Annotation const& annotation) = 0;
 
     /**
-    \brief Sends all filters and their state to the source of a query.
+    \brief Sends all filters and their states to the source of a query.
+    \deprecated Sending filter state back to the UI is deprecated and will be removed from future releases. Please use the push(Filters const&) method instead.
     \return True if the filters were accepted, false otherwise.
     */
     virtual bool push(Filters const& filters, FilterState const& filter_state) = 0;
@@ -190,6 +191,12 @@
     */
     virtual void push_surfacing_results_from_cache() = 0;
 
+    /**
+    \brief Sends all filter definitions to the source of a query.
+    \return True if the filters were accepted, false otherwise.
+    */
+    virtual bool push(Filters const& filters) = 0;
+
 protected:
     /// @cond
     SearchReply();

=== modified file 'include/unity/scopes/internal/SearchReplyImpl.h'
--- include/unity/scopes/internal/SearchReplyImpl.h	2015-02-27 05:28:09 +0000
+++ include/unity/scopes/internal/SearchReplyImpl.h	2016-09-09 12:41:03 +0000
@@ -80,6 +80,8 @@
 
     virtual void push_surfacing_results_from_cache() noexcept override;
 
+    virtual bool push(unity::scopes::Filters const& filters) override;
+
 private:
     bool push(Category::SCPtr category);
     void write_cached_results() noexcept;
@@ -94,7 +96,6 @@
 
     Department::SCPtr cached_departments_;
     unity::scopes::Filters cached_filters_;
-    unity::scopes::FilterState cached_filter_state_;
     std::vector<unity::scopes::CategorisedResult> cached_results_;
     std::mutex mutex_;
 };

=== modified file 'include/unity/scopes/testing/MockScope.h'
--- include/unity/scopes/testing/MockScope.h	2015-05-29 10:17:42 +0000
+++ include/unity/scopes/testing/MockScope.h	2016-09-09 12:41:03 +0000
@@ -19,6 +19,8 @@
 #pragma once
 
 #include <unity/scopes/Scope.h>
+#include <unity/scopes/SearchMetadata.h>
+#include <unity/scopes/ActionMetadata.h>
 
 #include <unity/scopes/testing/MockObject.h>
 

=== modified file 'include/unity/scopes/testing/MockSearchReply.h'
--- include/unity/scopes/testing/MockSearchReply.h	2015-04-10 10:10:06 +0000
+++ include/unity/scopes/testing/MockSearchReply.h	2016-09-09 12:41:03 +0000
@@ -66,6 +66,7 @@
     MOCK_METHOD1(lookup_category, Category::SCPtr(std::string const&));
     MOCK_METHOD1(push, bool(CategorisedResult const&));
     MOCK_METHOD2(push, bool(Filters const&, FilterState const&));
+    MOCK_METHOD1(push, bool(Filters const&));
     MOCK_METHOD1(push, bool(experimental::Annotation const& annotation));
     MOCK_METHOD0(push_surfacing_results_from_cache, void());
 

=== modified file 'include/unity/scopes/utility/internal/BufferedSearchReplyImpl.h'
--- include/unity/scopes/utility/internal/BufferedSearchReplyImpl.h	2015-02-27 05:28:09 +0000
+++ include/unity/scopes/utility/internal/BufferedSearchReplyImpl.h	2016-09-09 12:41:03 +0000
@@ -78,6 +78,7 @@
     std::string to_string() override;
 
     void flush();
+    bool push(unity::scopes::Filters const& filters) override;
 
 private:
     std::mutex mutex_;

=== modified file 'src/scopes/SearchListenerBase.cpp'
--- src/scopes/SearchListenerBase.cpp	2014-06-17 15:07:13 +0000
+++ src/scopes/SearchListenerBase.cpp	2016-09-09 12:41:03 +0000
@@ -44,6 +44,11 @@
     // Intentionally empty: "do nothing" default implementation.
 }
 
+void SearchListenerBase::push(Filters const& /* filters */)
+{
+    // Intentionally empty: "do nothing" default implementation.
+}
+
 void SearchListenerBase::push(Category::SCPtr const& /* category */)
 {
     // Intentionally empty: "do nothing" default implementation.

=== modified file 'src/scopes/internal/OnlineAccountClientImpl.cpp'
--- src/scopes/internal/OnlineAccountClientImpl.cpp	2016-03-16 12:08:16 +0000
+++ src/scopes/internal/OnlineAccountClientImpl.cpp	2016-09-09 12:41:03 +0000
@@ -545,12 +545,15 @@
     // (ensures that accounts_ is up to date)
     std::shared_ptr<GMainLoop> event_loop;
     event_loop.reset(g_main_loop_new(main_loop_context_.get(), true), g_main_loop_unref);
-    while(info->session)
+
+    int ms_elapsed = 0;
+    while (info->session && ms_elapsed < 5000)
     {
         // We need to wait inside an event loop to allow for the main application loop to
         // process its pending events
         std::shared_ptr<GSource> source;
         source.reset(g_timeout_source_new(10), g_source_unref);
+        ms_elapsed += 10;
         g_source_set_callback(source.get(), wake_up_event_loop_cb, event_loop.get(), NULL);
         g_source_attach(source.get(), main_loop_context_.get());
 
@@ -560,6 +563,15 @@
         lock.lock();
         info_lock.lock();
     }
+
+    // If the login session is still not responding, we cancel it
+    if (info->session)
+    {
+        std::cerr << "OnlineAccountClientImpl::flush_pending_session(): login for account: "
+                  << info->account_id << " is not responding. Canceling session." << std::endl;
+        signon_auth_session_cancel(info->session.get());
+        info->session = nullptr;
+    }
 }
 
 void OnlineAccountClientImpl::main_loop_state_notify(bool is_running)

=== modified file 'src/scopes/internal/RegistryConfig.cpp'
--- src/scopes/internal/RegistryConfig.cpp	2015-08-04 04:56:01 +0000
+++ src/scopes/internal/RegistryConfig.cpp	2016-09-09 12:41:03 +0000
@@ -71,9 +71,9 @@
         throw ConfigException(configfile + ": " + scoperunner_path_key + " must be an absolute path");
     }
     process_timeout_ = get_optional_int(registry_config_group, process_timeout_key, DFLT_PROCESS_TIMEOUT);
-    if (process_timeout_ < 10 || process_timeout_ > 15000)
+    if (process_timeout_ < 10 || process_timeout_ > 60000)
     {
-        throw_ex("Illegal value (" + to_string(process_timeout_) + ") for " + process_timeout_key + ": value must be 10-15000 ms");
+        throw_ex("Illegal value (" + to_string(process_timeout_) + ") for " + process_timeout_key + ": value must be 10-60000 ms");
     }
 
     KnownEntries const known_entries = {

=== modified file 'src/scopes/internal/ResultReplyObject.cpp'
--- src/scopes/internal/ResultReplyObject.cpp	2016-02-24 16:49:34 +0000
+++ src/scopes/internal/ResultReplyObject.cpp	2016-09-09 12:41:03 +0000
@@ -74,16 +74,11 @@
         }
 
         Filters const filters = FilterBaseImpl::deserialize_filters(it->second.get_array(), groups);
-        it = data.find("filter_state");
-        if (it != data.end())
-        {
-            auto filter_state = FilterStateImpl::deserialize(it->second.get_dict());
-            receiver_->push(filters, filter_state);
-        }
-        else
-        {
-            throw InvalidArgumentException("ResultReplyObject::push(): filters present but missing filter_state data");
-        }
+
+        // temporarily support both variants of push until the one supporting filter state gets dropped.
+        FilterState filter_state;
+        receiver_->push(filters, filter_state);
+        receiver_->push(filters);
     }
 
     it = data.find("category");

=== modified file 'src/scopes/internal/SearchReplyImpl.cpp'
--- src/scopes/internal/SearchReplyImpl.cpp	2016-02-25 16:08:01 +0000
+++ src/scopes/internal/SearchReplyImpl.cpp	2016-09-09 12:41:03 +0000
@@ -170,7 +170,12 @@
     return true;
 }
 
-bool SearchReplyImpl::push(unity::scopes::Filters const& filters, unity::scopes::FilterState const& filter_state)
+bool SearchReplyImpl::push(unity::scopes::Filters const& filters, unity::scopes::FilterState const&)
+{
+    return push(filters);
+}
+
+bool SearchReplyImpl::push(unity::scopes::Filters const& filters)
 {
     // basic consistency check
     try
@@ -186,7 +191,6 @@
     {
         lock_guard<mutex> lock(mutex_);
         cached_filters_ = filters;
-        cached_filter_state_ = filter_state;
     }
 
     VariantMap var;
@@ -196,7 +200,6 @@
         var["filter_groups"] = filter_groups;
     }
     var["filters"] = internal::FilterBaseImpl::serialize_filters(filters);
-    var["filter_state"] = filter_state.serialize();
     return ReplyImpl::push(var);
 }
 
@@ -260,7 +263,6 @@
             departments = cached_departments_->serialize();
         }
         auto filters = internal::FilterBaseImpl::serialize_filters(cached_filters_);
-        auto filter_state = cached_filter_state_.serialize();
         VariantArray categories = cat_registry_->serialize();
         VariantArray results;
         for (auto const& r : cached_results_)
@@ -279,7 +281,6 @@
         }
 
         vm["filters"] = move(filters);
-        vm["filter_state"] = move(filter_state);
 
         vm["results"] = move(results);
         string const json = Variant(move(vm)).serialize_json();
@@ -371,13 +372,6 @@
         }
         auto filter_array = it->second.get_array();
 
-        it = vm.find("filter_state");
-        if (it == vm.end())
-        {
-            throw unity::scopes::NotFoundException("malformed cache file", "filter_state");
-        }
-        auto filter_state_dict = it->second.get_dict();
-
         it = vm.find("results");
         if (it == vm.end())
         {
@@ -408,8 +402,7 @@
         }
 
         auto filters = FilterBaseImpl::deserialize_filters(move(filter_array), groups);
-        auto filter_state = FilterStateImpl::deserialize(move(filter_state_dict));
-        push(filters, filter_state);
+        push(filters);
 
         for (auto const& r : result_array)
         {

=== modified file 'src/scopes/internal/zmq_middleware/ZmqConfig.cpp'
--- src/scopes/internal/zmq_middleware/ZmqConfig.cpp	2015-07-01 10:59:49 +0000
+++ src/scopes/internal/zmq_middleware/ZmqConfig.cpp	2016-09-09 12:41:03 +0000
@@ -80,21 +80,21 @@
     }
 
     registry_timeout_ = get_optional_int(zmq_config_group, registry_timeout_key, DFLT_ZMQ_REGISTRY_TIMEOUT);
-    if (registry_timeout_ < 10 || registry_timeout_ > 15000)
+    if (registry_timeout_ < 10 || registry_timeout_ > 60000)
     {
-        throw_ex("Illegal value (" + to_string(registry_timeout_) + ") for " + registry_timeout_key + ": value must be 10-15000");
+        throw_ex("Illegal value (" + to_string(registry_timeout_) + ") for " + registry_timeout_key + ": value must be 10-60000");
     }
 
     locate_timeout_ = get_optional_int(zmq_config_group, locate_timeout_key, DFLT_ZMQ_LOCATE_TIMEOUT);
-    if (locate_timeout_ < 10 || locate_timeout_ > 15000)
+    if (locate_timeout_ < 10 || locate_timeout_ > 60000)
     {
-        throw_ex("Illegal value (" + to_string(locate_timeout_) + ") for " + locate_timeout_key + ": value must be 10-15000");
+        throw_ex("Illegal value (" + to_string(locate_timeout_) + ") for " + locate_timeout_key + ": value must be 10-60000");
     }
 
     child_scopes_timeout_ = get_optional_int(zmq_config_group, child_scopes_timeout_key, DFLT_ZMQ_CHILDSCOPES_TIMEOUT);
-    if (child_scopes_timeout_ < 10 || child_scopes_timeout_ > 15000)
+    if (child_scopes_timeout_ < 10 || child_scopes_timeout_ > 60000)
     {
-        throw_ex("Illegal value (" + to_string(child_scopes_timeout_) + ") for " + child_scopes_timeout_key + ": value must be 10-15000");
+        throw_ex("Illegal value (" + to_string(child_scopes_timeout_) + ") for " + child_scopes_timeout_key + ": value must be 10-60000");
     }
 
     registry_endpoint_dir_ = get_optional_string(zmq_config_group, registry_endpoint_dir_key);

=== modified file 'src/scopes/testing/InProcessBenchmark.cpp'
--- src/scopes/testing/InProcessBenchmark.cpp	2015-01-09 07:10:07 +0000
+++ src/scopes/testing/InProcessBenchmark.cpp	2016-09-09 12:41:03 +0000
@@ -204,6 +204,11 @@
         return true;
     }
 
+    bool push(unity::scopes::Filters const&) override
+    {
+        return true;
+    }
+
     bool push(unity::scopes::experimental::Annotation const&) override
     {
         return true;

=== modified file 'src/scopes/utility/internal/BufferedSearchReplyImpl.cpp'
--- src/scopes/utility/internal/BufferedSearchReplyImpl.cpp	2015-02-27 05:28:09 +0000
+++ src/scopes/utility/internal/BufferedSearchReplyImpl.cpp	2016-09-09 12:41:03 +0000
@@ -92,6 +92,11 @@
     return upstream_->push(filters, filter_state);
 }
 
+bool BufferedSearchReplyImpl::push(unity::scopes::Filters const& filters)
+{
+    return upstream_->push(filters);
+}
+
 void BufferedSearchReplyImpl::push_surfacing_results_from_cache() noexcept
 {
     upstream_->push_surfacing_results_from_cache();

=== modified file 'test/gtest/scopes/Filters/Filters_test.cpp'
--- test/gtest/scopes/Filters/Filters_test.cpp	2016-03-03 11:46:25 +0000
+++ test/gtest/scopes/Filters/Filters_test.cpp	2016-09-09 12:41:03 +0000
@@ -66,12 +66,19 @@
 class SearchReceiver : public SearchListenerBase, public WaitUntilFinished
 {
 public:
-    virtual void push(CategorisedResult /* result */) override {}
-
-    virtual void push(Filters const& filters, FilterState const& filter_state) override
+    virtual void push(CategorisedResult result) override
+    {
+        result_uri = result.uri();
+    }
+
+    virtual void push(Filters const& filters, FilterState const&) override
+    {
+        this->filters2 = filters;
+    }
+
+    virtual void push(Filters const& filters) override
     {
         this->filters = filters;
-        this->filter_state = filter_state;
     }
 
     virtual void finished(CompletionDetails const& details) override
@@ -81,7 +88,8 @@
     }
 
     Filters filters;
-    FilterState filter_state;
+    Filters filters2;
+    std::string result_uri;
 };
 
 template <typename ScopeType>
@@ -135,8 +143,13 @@
     auto ctrl = scope->search("test", hints, receiver);
     receiver->wait_until_finished();
 
-    auto filter_state = receiver->filter_state; // copy filter state, it will be sent with 2nd query
+    EXPECT_EQ("no options active", receiver->result_uri);
+
+    FilterState filter_state;
     {
+        // make sure the deprecated API push method for filters still works
+        ASSERT_EQ(1u, receiver->filters2.size());
+
         auto filters = receiver->filters;
         ASSERT_EQ(1u, filters.size());
         EXPECT_EQ("f1", filters.front()->id());
@@ -159,11 +172,9 @@
     receiver->wait_until_finished();
     {
         auto filters = receiver->filters;
-        auto filter_state2 = receiver->filter_state;
+        ASSERT_EQ(1u, filters.size());
         auto selector = std::dynamic_pointer_cast<const OptionSelectorFilter>(filters.front());
-        ASSERT_EQ(1u, selector->active_options(filter_state2).size());
-        auto option1 = *(selector->active_options(filter_state2).begin());
-        EXPECT_EQ("o1", option1->id());
+        EXPECT_EQ("option o1 active", receiver->result_uri);
     }
 }
 

=== modified file 'test/gtest/scopes/Filters/TestScope.h'
--- test/gtest/scopes/Filters/TestScope.h	2016-02-25 16:08:01 +0000
+++ test/gtest/scopes/Filters/TestScope.h	2016-09-09 12:41:03 +0000
@@ -21,6 +21,7 @@
 #include <unity/scopes/CategorisedResult.h>
 #include <unity/scopes/Category.h>
 #include <unity/scopes/FilterGroup.h>
+#include <unity/scopes/FilterOption.h>
 #include <unity/scopes/OptionSelectorFilter.h>
 #include <unity/scopes/ScopeBase.h>
 #include <unity/scopes/SearchReply.h>
@@ -49,11 +50,27 @@
         filter->add_option("o2", "Option 2");
         filters.push_back(filter);
         auto active_opts = filter->active_options(query().filter_state());
-        reply->push(filters, query().filter_state()); // send unmodified state back
+
+        if (query().query_string() == "test")
+        {
+            reply->push(filters);
+        }
+        else
+        {
+            // use the deprecated push call
+            reply->push(filters, query().filter_state());
+        }
 
         auto cat = reply->register_category("cat1", "Category 1", "");
         CategorisedResult res(cat);
-        res.set_uri("uri");
+        if (active_opts.size() == 1)
+        {
+            res.set_uri("option " + (*(active_opts.begin()))->id() + " active");
+        }
+        else
+        {
+            res.set_uri("no options active");
+        }
         res.set_dnd_uri("dnd_uri");
         reply->push(res);
     }

=== modified file 'test/gtest/scopes/ResultCache/ResultCache_test.cpp'
--- test/gtest/scopes/ResultCache/ResultCache_test.cpp	2016-02-25 17:28:22 +0000
+++ test/gtest/scopes/ResultCache/ResultCache_test.cpp	2016-09-09 12:41:03 +0000
@@ -46,11 +46,10 @@
         dept_ = parent;
     }
 
-    virtual void push(Filters const& filters, FilterState const& filter_state) override
+    virtual void push(Filters const& filters) override
     {
         lock_guard<mutex> lock(mutex_);
         filters_ = filters;
-        filter_state_ = filter_state;
     }
 
     virtual void push(CategorisedResult result) override
@@ -86,12 +85,6 @@
         return filters_;
     }
 
-    FilterState filter_state() const
-    {
-        lock_guard<mutex> lock(mutex_);
-        return filter_state_;
-    }
-
     CategorisedResult::SCPtr result() const
     {
         lock_guard<mutex> lock(mutex_);
@@ -101,7 +94,6 @@
 private:
     Department::SCPtr dept_;
     Filters filters_;
-    FilterState filter_state_;
     CategorisedResult::SCPtr result_;
     bool query_complete_;
     mutable mutex mutex_;
@@ -248,9 +240,6 @@
     auto osf = dynamic_pointer_cast<OptionSelectorFilter const>(f);
     ASSERT_TRUE(osf != nullptr);
     EXPECT_EQ("Choose an option", osf->label());
-    auto fs = receiver->filter_state();
-    EXPECT_TRUE(fs.has_filter("f1"));
-    EXPECT_TRUE(osf->has_active_option(fs));
 
     // Cache file must still be there.
     boost::system::error_code ec;
@@ -290,9 +279,6 @@
     auto osf = dynamic_pointer_cast<OptionSelectorFilter const>(f);
     ASSERT_TRUE(osf != nullptr);
     EXPECT_EQ("Choose an option", osf->label());
-    auto fs = receiver->filter_state();
-    EXPECT_TRUE(fs.has_filter("f1"));
-    EXPECT_TRUE(osf->has_active_option(fs));
 
     // Cache file must still be there.
     boost::system::error_code ec;
@@ -344,9 +330,6 @@
     auto osf = dynamic_pointer_cast<OptionSelectorFilter const>(f);
     ASSERT_TRUE(osf != nullptr);
     EXPECT_EQ("Choose an option", osf->label());
-    auto fs = receiver->filter_state();
-    EXPECT_TRUE(fs.has_filter("f1"));
-    EXPECT_TRUE(osf->has_active_option(fs));
 
     // New cache file must have been created
     boost::system::error_code ec;
@@ -414,20 +397,6 @@
     EXPECT_TRUE(boost::filesystem::exists(TEST_RUNTIME_PATH "/unconfined/CacheScope/.surfacing_cache", ec));
 }
 
-TEST_F(CacheScopeTest, missing_filter_state)
-{
-    // Get coverage on missing filters_state entry
-    system("cp " TEST_SOURCE_PATH "/no_filter_state_cache " TEST_RUNTIME_PATH "/unconfined/CacheScope/.surfacing_cache");
-    auto receiver = make_shared<Receiver>();
-    scope()->search("", SearchMetadata("unused", "unused"), receiver);
-    receiver->wait_until_finished();
-    EXPECT_EQ(receiver->result(), nullptr);
-
-    // Cache file must still be there, but decode will have failed.
-    boost::system::error_code ec;
-    EXPECT_TRUE(boost::filesystem::exists(TEST_RUNTIME_PATH "/unconfined/CacheScope/.surfacing_cache", ec));
-}
-
 TEST_F(CacheScopeTest, missing_results)
 {
     // Get coverage on missing results entry

=== removed file 'test/gtest/scopes/ResultCache/no_filter_state_cache'
--- test/gtest/scopes/ResultCache/no_filter_state_cache	2015-02-05 09:35:42 +0000
+++ test/gtest/scopes/ResultCache/no_filter_state_cache	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-{"categories":[{"icon":"","id":"CacheScope","renderer_template":"\n    {\n        \"schema-version\":1,\n        \"template\":\n        {\n            \"category-layout\":\"grid\"\n        },\n        \"components\":\n        {\n            \"title\":\"title\",\n            \"art\":\"art\"\n        }\n    }\n    ","title":""}],"departments":{"departments":[{"label":"Sub","query":{"department_id":"sub","filter_state":{},"query_string":"","scope":"CacheScope"}}],"label":"Top","query":{"department_id":"","filter_state":{},"query_string":"","scope":"CacheScope"}},"filters":[{"filter_type":"option_selector","id":"f1","label":"Choose an option","multi_select":false,"options":[{"id":"o1","label":"Option 1"},{"id":"o2","label":"Option 2"}]}],"results":[{"attrs":{"title":"","uri":"uri"},"internal":{"cat_id":"CacheScope"}}]}

=== modified file 'test/gtest/scopes/internal/smartscopes/CMakeLists.txt'
--- test/gtest/scopes/internal/smartscopes/CMakeLists.txt	2014-08-28 11:18:44 +0000
+++ test/gtest/scopes/internal/smartscopes/CMakeLists.txt	2016-09-09 12:41:03 +0000
@@ -1,4 +1,8 @@
 add_subdirectory(HttpClient)
-add_subdirectory(SmartScopesClient)
+if (NOT ${CMAKE_LIBRARY_ARCHITECTURE} MATCHES "aarch64")
+    add_subdirectory(SmartScopesClient)
+else()
+    message("Skipping SmartScopesClient test on aarch64 - see LP #1615004")
+endif()
 add_subdirectory(smartscopesproxy)
 add_subdirectory(SSConfig)