Merge lp:~andreas-pokorny/mir/mediate-nested-cursor-configuration-on-construction into lp:mir

[Andreas Pokorny]

Store the cursor image configured in MirClientHostConnection

Due to rather accidental construction orders the initial configuration of the nested surface cursor images is lost.
It is done by mir::graphics::nested::Cursor::Cusor but in the current setup it is constructed ahead of mir::graphics::nested::Display and
any attached DisplayBuffers. With this change the construction order is no longer relevant.

A change of the construction order will happen due to the changes in the nested input platform.

This is a split out from the nested input platform work. On lp:mir the nested cursor attempts to set the default cursor image to the hostconnection which then turns to all available surfaces and applies the cursor image. But since the display buffers need the cursor listener interface and since the display buffers are created on construction that immediate cursor image setting fails.

It fails, but at the same time it also fulfills one of our acceptance tests which require no buffer submission on startup of the nested server.

The nested input platform MP makes small changes to the dependencies and thus changes the order in which Cursor and Display constructors are executed. Thus setting the cursor images succeeds so we get one buffer submission on the buffer stream of the cursor images on nested server construction.

This MP stores the CursorImage inside the MirHostClientConnection and makes the cursor configuration succeed during construction time.

[Mir CI Bot (mir-ci-bot)]

FAILED: Continuous integration, rev:3483
https://mir-jenkins.ubuntu.com/job/mir-ci/911/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/957/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/998
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/989
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/989
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/967/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/967
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/967/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/967
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/967/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/967
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/967/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/967/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/911/rebuild

review: Needs Fixing (continuous-integration)

[Cemil Azizoglu (cemil-azizoglu)]

ok

review: Approve

[Mir CI Bot (mir-ci-bot)]

FAILED: Continuous integration, rev:3484
https://mir-jenkins.ubuntu.com/job/mir-ci/915/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/962/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1004
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/995
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/995
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/972/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/972
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/972/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/972
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/972/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/972
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/972/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/972/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/915/rebuild

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

Related to bug 1447839 at all?

[Kevin DuBois (kdub)]

+ buffer.resize(size_.width.as_int() * size_.height.as_int() * 4);
would be nicer to use MIR_BYTES_PER_PIXEL macro

+ NestedCursorImage& operator=(graphics::CursorImage const& other);
assign without a copy-constructor?

+ if (stored_cursor_image.size().width.as_int() * stored_cursor_image.size().width.as_int())
should the 2nd term be width (seems to be checking for non-zero width and non-zero height)

review: Needs Fixing

[Chris Halse Rogers (raof)]

Ok, modulo Kevin's needs-fixings.

review: Approve

[Mir CI Bot (mir-ci-bot)]

FAILED: Continuous integration, rev:3485
https://mir-jenkins.ubuntu.com/job/mir-ci/940/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/1002/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1048
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1039
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1039
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1012
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1012/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1012
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1012/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1012
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1012/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1012
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1012/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/1012/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/940/rebuild

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

OK

review: Approve

[Mir CI Bot (mir-ci-bot)]

FAILED: Continuous integration, rev:3485
https://mir-jenkins.ubuntu.com/job/mir-ci/950/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/1017/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1063
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1054
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1054
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1027/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1027
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1027/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1027
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1027/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1027
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1027/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/1027/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/950/rebuild

review: Needs Fixing (continuous-integration)

[Mir CI Bot (mir-ci-bot)]

FAILED: Continuous integration, rev:3485
https://mir-jenkins.ubuntu.com/job/mir-ci/961/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/1031/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1077
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1068
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1068
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1041/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1041
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1041/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1041
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1041/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1041
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1041/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/1041
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/1041/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/961/rebuild

review: Needs Fixing (continuous-integration)

[Mir CI Bot (mir-ci-bot)]

FAILED: Continuous integration, rev:3486
https://mir-jenkins.ubuntu.com/job/mir-ci/974/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/1052/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1099
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1090
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1090
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1062/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1062/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1062
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1062/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1062
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1062/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/1062
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/1062/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/974/rebuild

review: Needs Fixing (continuous-integration)

[Kevin DuBois (kdub)]

lgtm, sorry for the delay in reviewing.

review: Approve

[Alan Griffiths (alan-griffiths)]

CI failure looks like lp:1523621

Rebuilding...

[Mir CI Bot (mir-ci-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
https://mir-jenkins.ubuntu.com/job/mir-autolanding/271/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/1086/console
    None: https://mir-jenkins.ubuntu.com/job/generic-land-mp/293/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1134
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1125
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1125
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1096/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1096
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1096/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1096
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1096/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1096
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1096/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/1096
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/1096/artifact/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

Just bug 1576690. Try again.

[Andreas Pokorny (andreas-pokorny)]

hm something is different in the vivid vms .. the logs about the display configuration take a lot longer than the normal execution time .. so i changed the initial sleep-hack.

[Mir CI Bot (mir-ci-bot)]

review: Approve (continuous-integration)

=== modified file 'src/server/graphics/nested/mir_client_host_connection.cpp'
--- src/server/graphics/nested/mir_client_host_connection.cpp	2016-03-29 07:30:50 +0000
+++ src/server/graphics/nested/mir_client_host_connection.cpp	2016-05-20 08:08:26 +0000
@@ -36,7 +36,7 @@
 #include <algorithm>
 #include <stdexcept>
 
-#include <string.h>
+#include <cstring>
 
 namespace mg = mir::graphics;
 namespace mgn = mir::graphics::nested;
@@ -150,7 +150,7 @@
 
     for (int row = 0; row != image_height; ++row)
     {
-        memcpy(dest, src, image_stride);
+        std::memcpy(dest, src, image_stride);
         dest += g.stride;
         src += image_stride;
     }
@@ -256,6 +256,39 @@
 
 }
 
+void const* mgn::MirClientHostConnection::NestedCursorImage::as_argb_8888() const
+{
+    return buffer.data();
+}
+
+mir::geometry::Size mgn::MirClientHostConnection::NestedCursorImage::size() const
+{
+    return size_;
+}
+
+mir::geometry::Displacement mgn::MirClientHostConnection::NestedCursorImage::hotspot() const
+{
+    return hotspot_;
+}
+
+mgn::MirClientHostConnection::NestedCursorImage::NestedCursorImage(mg::CursorImage const& other)
+    : hotspot_(other.hotspot()),
+      size_(other.size()),
+      buffer(size_.width.as_int() * size_.height.as_int() * MIR_BYTES_PER_PIXEL(mir_pixel_format_argb_8888))
+{
+    std::memcpy(buffer.data(), other.as_argb_8888(), buffer.size());
+}
+
+mgn::MirClientHostConnection::NestedCursorImage& mgn::MirClientHostConnection::NestedCursorImage::operator=(mg::CursorImage const& other)
+{
+    hotspot_ = other.hotspot();
+    size_ = other.size();
+    buffer.resize(size_.width.as_int() * size_.height.as_int() * MIR_BYTES_PER_PIXEL(mir_pixel_format_argb_8888));
+    std::memcpy(buffer.data(), other.as_argb_8888(), buffer.size());
+
+    return *this;
+}
+
 mgn::MirClientHostConnection::MirClientHostConnection(
     std::string const& host_socket,
     std::string const& name,
@@ -362,6 +395,9 @@
             delete surf;
         });
 
+    if (stored_cursor_image.size().width.as_int() * stored_cursor_image.size().height.as_int())
+        surf->set_cursor_image(stored_cursor_image);
+
     surfaces.push_back(surf.get());
     return surf;
 }
@@ -398,10 +434,11 @@
 void mgn::MirClientHostConnection::set_cursor_image(mg::CursorImage const& image)
 {
     std::lock_guard<std::mutex> lg(surfaces_mutex);
+    stored_cursor_image = image;
     for (auto s : surfaces)
     {
         auto surface = static_cast<MirClientHostSurface*>(s);
-        surface->set_cursor_image(image);
+        surface->set_cursor_image(stored_cursor_image);
     }
 }
 

=== modified file 'src/server/graphics/nested/mir_client_host_connection.h'
--- src/server/graphics/nested/mir_client_host_connection.h	2016-03-29 07:30:50 +0000
+++ src/server/graphics/nested/mir_client_host_connection.h	2016-05-20 08:08:26 +0000
@@ -22,8 +22,12 @@
 #include "host_connection.h"
 #include "mir/shell/host_lifecycle_event_listener.h"
 #include "mir/input/input_device_hub.h"
+#include "mir/geometry/size.h"
+#include "mir/geometry/displacement.h"
+#include "mir/graphics/cursor_image.h"
 
 #include <string>
+#include <vector>
 #include <mutex>
 
 struct MirConnection;
@@ -97,6 +101,21 @@
     std::vector<std::shared_ptr<input::Device>> devices;
     UniqueInputConfig config;
 
+    struct NestedCursorImage : graphics::CursorImage
+    {
+        NestedCursorImage() = default;
+        NestedCursorImage(graphics::CursorImage const& other);
+        NestedCursorImage& operator=(graphics::CursorImage const& other);
+
+        void const* as_argb_8888() const override;
+        geometry::Size size() const override;
+        geometry::Displacement hotspot() const override;
+    private:
+        geometry::Displacement hotspot_;
+        geometry::Size size_;
+        std::vector<uint8_t> buffer;
+    };
+    NestedCursorImage stored_cursor_image;
 };
 
 }

=== modified file 'tests/acceptance-tests/test_nested_mir.cpp'
--- tests/acceptance-tests/test_nested_mir.cpp	2016-05-03 04:36:33 +0000
+++ tests/acceptance-tests/test_nested_mir.cpp	2016-05-20 08:08:26 +0000
@@ -620,8 +620,10 @@
 
 TEST_F(NestedServer, posts_when_scene_has_visible_changes)
 {
-    // No post on surface creation
-    EXPECT_CALL(*mock_session_mediator_report, session_submit_buffer_called(_)).Times(0);
+    auto const number_of_nested_surfaces = 2;
+    auto const number_of_cursor_streams = number_of_nested_surfaces;
+    // No post on surface creation for the display surfaces - but preparing the cursor is fine
+    EXPECT_CALL(*mock_session_mediator_report, session_submit_buffer_called(_)).Times(number_of_cursor_streams);
     NestedMirRunner nested_mir{new_connection()};
 
     auto const connection = mir_connect_sync(nested_mir.new_connection().c_str(), __PRETTY_FUNCTION__);
@@ -636,7 +638,7 @@
     {
         mt::Signal wait;
 
-        EXPECT_CALL(*mock_session_mediator_report, session_submit_buffer_called(_)).Times(2)
+        EXPECT_CALL(*mock_session_mediator_report, session_submit_buffer_called(_)).Times(number_of_nested_surfaces)
             .WillOnce(InvokeWithoutArgs([]{}))
             .WillOnce(InvokeWithoutArgs([&] { wait.raise(); }));
 
@@ -650,7 +652,7 @@
     {
         mt::Signal wait;
 
-        EXPECT_CALL(*mock_session_mediator_report, session_submit_buffer_called(_)).Times(2)
+        EXPECT_CALL(*mock_session_mediator_report, session_submit_buffer_called(_)).Times(number_of_nested_surfaces)
             .WillOnce(InvokeWithoutArgs([]{}))
             .WillOnce(InvokeWithoutArgs([&] { wait.raise(); }));
 
@@ -770,7 +772,8 @@
 
     // TODO workaround for lp:1523621
     // (I don't see a way to detect that the host has placed focus on "Mir nested display for output #1")
-    std::this_thread::sleep_for(10ms);
+    std::this_thread::sleep_for(1s);
+    Mock::VerifyAndClearExpectations(mock_cursor.get());
 
     for (auto const name : cursor_names)
     {