Merge lp:~alan-griffiths/mir/NestedServer.posts_when_scene_has_visible_changes into lp:mir

[Alan Griffiths]

tests: Test we get exactly the expected posts from a nested server

tests: Test we get exactly the expected posts from a nested server

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2623
http://jenkins.qa.ubuntu.com/job/mir-ci/4010/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/2715
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/228
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/2663
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/166/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2663
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2663/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5508
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20969

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/4010/rebuild

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

7: [ RUN ] NestedInput.nested_event_filter_receives_keyboard_from_host
7: [1433432727.674278] mirserver: Starting
7: [1433432727.675137] mirserver: Selected driver: dummy (version 0.14.0)
7: [1433432727.679338] mirserver: Using software cursor
7: [1433432727.681407] mirserver: Mir version 0.14.0
7: [1433432727.732641] mirserver: Starting
7: [1433432727.733449] mirserver: Selected driver: dummy (version 0.14.0)
7: [1433432727.894537] mirserver: Mir version 0.14.0
7: [1433432738.076193] mirserver: Stopping
7: /tmp/buildd/mir-0.14.0bzr2624pkg0wily166/tests/acceptance-tests/test_nested_input.cpp:149: Failure
7: Actual function call count doesn't match EXPECT_CALL(*nested_mir.mock_event_filter, handle(_))...
7: Expected: to be called at least once
7: Actual: never called - unsatisfied and active
7: [1433432738.154764] mirserver: Stopping
7: [ FAILED ] NestedInput.nested_event_filter_receives_keyboard_from_host (10518 ms)

Unrelated

[lp:~alan-griffiths/mir/NestedServer.posts_when_scene_has_visible_changes]

2624. By Alan Griffiths on 2015-06-05

merge lp:mir

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2624
http://jenkins.qa.ubuntu.com/job/mir-ci/4020/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/2734
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/247
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/2682
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/176
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/176/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2682
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2682/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5526
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20988

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/4020/rebuild

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

33+ // No post on surface creation
37+ auto const surface = mtf::make_any_surface(connection);
38+ Mock::VerifyAndClearExpectations(mock_session_mediator_report.get());

Due to the asynchronous nature of our communications (mainly from nested to host in this case) and processing, the absence of an exchange buffer call at this point doesn't provide the guarantee we want, since the exchange may occur at some later time. Introducing a delay would improve our chances of catching a regression at this checkpoint.

A redeeming feature of this particular test is that if we regress (i.e., post a buffer to the host when the client surface is created) and we don't catch the problem at the first checkpoint, the test will probably fail at a subsequent checkpoint because we will see one more buffer exchange than expected.

It would be good to document that the first checkpoint does not provide a strong guarantee of correctness, or perhaps remove it completely, and let the other checkpoints do the work.

A weak needs fixing.

review: Needs Fixing

[lp:~alan-griffiths/mir/NestedServer.posts_when_scene_has_visible_changes]

2625. By Alan Griffiths on 2015-06-08

Helpful message

2626. By Alan Griffiths on 2015-06-08

merge lp:mir

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2626
http://jenkins.qa.ubuntu.com/job/mir-ci/4032/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/2750
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/263
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/2698
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/188
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/188/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2698
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2698/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5542
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21012

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/4032/rebuild

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

Looks good.

review: Approve

=== modified file 'tests/acceptance-tests/test_nested_mir.cpp'
--- tests/acceptance-tests/test_nested_mir.cpp	2015-05-19 21:34:34 +0000
+++ tests/acceptance-tests/test_nested_mir.cpp	2015-06-08 15:15:01 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2014 Canonical Ltd.
+ * Copyright © 2013-2015 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3,
@@ -37,13 +37,11 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
-#include <mutex>
-#include <condition_variable>
-
 namespace geom = mir::geometry;
 namespace mf = mir::frontend;
 namespace mg = mir::graphics;
 namespace msh = mir::shell;
+namespace mt = mir::test;
 namespace mtd = mir::test::doubles;
 namespace mtf = mir_test_framework;
 
@@ -246,3 +244,51 @@
     mir_surface_release_sync(surface);
     mir_connection_release(c);
 }
+
+TEST_F(NestedServer, posts_when_scene_has_visible_changes)
+{
+    // No post on surface creation
+    EXPECT_CALL(*mock_session_mediator_report, session_exchange_buffer_called(_)).Times(0);
+    NestedMirRunner nested_mir{new_connection()};
+    auto const connection = mir_connect_sync(nested_mir.new_connection().c_str(), __PRETTY_FUNCTION__);
+    auto const surface = mtf::make_any_surface(connection);
+
+    // NB there is no synchronization to guarantee that a spurious post on surface creation will have 
+    // been seen by this point (although in testing it was invariably the case). However, any missed post
+    // would be included in one of the later counts and cause a test failure.
+    Mock::VerifyAndClearExpectations(mock_session_mediator_report.get());
+
+    // One post when surface drawn
+    {
+        mt::WaitCondition wait;
+
+        EXPECT_CALL(*mock_session_mediator_report, session_exchange_buffer_called(_)).Times(1)
+                .WillOnce(InvokeWithoutArgs([&] { wait.wake_up_everyone(); }));
+
+        mir_buffer_stream_swap_buffers_sync(mir_surface_get_buffer_stream(surface));
+
+        wait.wait_for_at_most_seconds(1);
+        Mock::VerifyAndClearExpectations(mock_session_mediator_report.get());
+    }
+
+    // One post when surface released
+    {
+        mt::WaitCondition wait;
+
+        EXPECT_CALL(*mock_session_mediator_report, session_exchange_buffer_called(_)).Times(1)
+                .WillOnce(InvokeWithoutArgs([&] { wait.wake_up_everyone(); }));
+
+        mir_surface_release_sync(surface);
+        mir_connection_release(connection);
+
+        wait.wait_for_at_most_seconds(1);
+        Mock::VerifyAndClearExpectations(mock_session_mediator_report.get());
+    }
+
+    // No post during shutdown
+    EXPECT_CALL(*mock_session_mediator_report, session_exchange_buffer_called(_)).Times(0);
+
+    // Ignore other shutdown events
+    EXPECT_CALL(*mock_session_mediator_report, session_release_surface_called(_)).Times(AnyNumber());
+    EXPECT_CALL(*mock_session_mediator_report, session_disconnect_called(_)).Times(AnyNumber());
+}