Merge lp:~alan-griffiths/mir/fix-1218436 into lp:mir

[Alan Griffiths]

tests: Add expectation to validate second SessionAuthorizer method is called wit correct parameter.

tests: Add expectation to validate second SessionAuthorizer method is called wit correct parameter.

This silences the GMOCK WARNING associated with ClientPidTestFixture.session_authorizer_receives_pid_of_connecting_clients

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1405
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/883/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/960
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/957
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/552
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/613
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/613/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/620
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/620/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/553
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/553/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/529
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4047

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/883/rebuild

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

OK.

review: Approve

[Alberto Aguirre (albaguirre)]

review: Approve

=== modified file 'tests/acceptance-tests/test_client_authorization.cpp'
--- tests/acceptance-tests/test_client_authorization.cpp	2014-01-13 06:12:33 +0000
+++ tests/acceptance-tests/test_client_authorization.cpp	2014-02-18 14:38:00 +0000
@@ -116,6 +116,8 @@
 
             EXPECT_CALL(mock_authorizer, connection_is_allowed(client_pid)).Times(1)
                 .WillOnce(Return(true));
+            EXPECT_CALL(mock_authorizer, configure_display_is_allowed(client_pid)).Times(1)
+                .WillOnce(Return(false));
             connect_sync.try_signal_ready_for();
         }