Merge lp:~mir-team/unity-system-compositor/cookie-entropy-workaround into lp:unity-system-compositor

[Brandon Schaefer]

Set the size of the vector to the expected size internally. This is just a workaround until we fix some things in mir!

Set the size of the vector to the expected size internally. This is just a workaround until we fix some things in mir!

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:275
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/343/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-xenial-amd64-ci/44/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-xenial-armhf-ci/43/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-xenial-i386-ci/43/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-system-compositor-ci/343/rebuild

review: Needs Fixing (continuous-integration)

[Alexandros Frantzis (afrantzis)]

OK as a temporary fix, as long as we remember to update this when we ship the Mir fix.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/server.cpp'
--- src/server.cpp	2016-01-27 14:58:39 +0000
+++ src/server.cpp	2016-02-08 19:17:37 +0000
@@ -110,7 +110,9 @@
 
     std::vector<uint8_t> serialize() const override
     {
-        return std::vector<uint8_t>();
+        // FIXME Workaround until mir fixes its internal message bliting
+        // This size needs to equal mir/src/include/cookie/mir/cookie/blob.h::default_blob_size
+        return std::vector<uint8_t>(29);
     }
 };