Merge lp:~mir-team/mir/fix-1555708 into lp:mir

[Kevin DuBois]

fix CI problem in lp: #1555708 by polling for the expected config. The client here had knowledge most clients wouldn't have, which is the the actual configuration given to the server.

fix CI problem in lp: #1555708 by polling for the expected config. The client here had knowledge most clients wouldn't have, which is the the actual configuration given to the server.

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

PASSED: Continuous integration, rev:3384
https://mir-jenkins.ubuntu.com/job/mir-ci/541/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/415
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/445
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/437
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/437
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/424
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/424/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/424
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/424/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/424
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/424/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/424
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/424/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/424
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/424/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Cemil Azizoglu (cemil-azizoglu)]

ok

review: Approve

[Chris Halse Rogers (raof)]

This seems like a fine minimal fix for the test, but leaves behind an actual client-visible race.

If this test did not have privileged knowledge about the expected input state, how would it work?

review: Approve

=== modified file 'tests/acceptance-tests/test_client_input.cpp'
--- tests/acceptance-tests/test_client_input.cpp	2016-03-08 20:43:41 +0000
+++ tests/acceptance-tests/test_client_input.cpp	2016-03-10 20:28:59 +0000
@@ -772,12 +772,28 @@
     return one_of_the_devices_matched;
 }
 
+//Poll for the expected config to fix lp: #1555708. Client can't expect synchronization
+//with the server on the input config.
 TEST_F(TestClientInput, client_input_config_request_receives_all_attached_devices)
 {
     auto con = mir_connect_sync(new_connection().c_str(), first.c_str());
     auto config = mir_connection_create_input_config(con);
+    int limit = 10;
+    int num_devices = 0;
+    int expected_devices = 3;
+ 
+    for(auto i = 0; i < limit; i++)
+    {
+        num_devices = mir_input_config_device_count(config);
+        if (num_devices == expected_devices)
+            break;
+ 
+        std::this_thread::sleep_for(std::chrono::milliseconds(10));
+        mir_input_config_destroy(config);
+        config = mir_connection_create_input_config(con);
+    }
 
-    EXPECT_THAT(mir_input_config_device_count(config), Eq(3));
+    ASSERT_THAT(mir_input_config_device_count(config), Eq(expected_devices));
 
     EXPECT_THAT(config, ADeviceMatches(keyboard_name, keyboard_unique_id, mir_input_device_capability_keyboard));
     EXPECT_THAT(config, ADeviceMatches(mouse_name, mouse_unique_id, mir_input_device_capability_pointer));