Mir

Merge lp://qastaging/~afrantzis/mir/server-side-set-base-display-configuration into lp://qastaging/mir

  1. server-side-set-base-display-configuration
  2. Merge into development-branch
Proposed by Alexandros Frantzis
Status: Merged
Merged at revision: 3063
Proposed branch: lp://qastaging/~afrantzis/mir/server-side-set-base-display-configuration
Merge into: lp://qastaging/mir
Diff against target: 550 lines (+202/-63)
18 files modified
include/server/mir/frontend/session_mediator_report.h (+2/-0)
src/include/server/mir/frontend/display_changer.h (+2/-0)
src/server/frontend/session_mediator.cpp (+51/-24)
src/server/frontend/session_mediator.h (+8/-0)
src/server/frontend/unauthorized_display_changer.cpp (+5/-0)
src/server/frontend/unauthorized_display_changer.h (+1/-0)
src/server/report/logging/session_mediator_report.cpp (+5/-0)
src/server/report/logging/session_mediator_report.h (+2/-0)
src/server/report/lttng/session_mediator_report.cpp (+1/-0)
src/server/report/lttng/session_mediator_report.h (+1/-0)
src/server/report/lttng/session_mediator_report_tp.h (+1/-0)
src/server/report/null/session_mediator_report.cpp (+4/-0)
src/server/report/null/session_mediator_report.h (+2/-0)
tests/acceptance-tests/test_nested_mir.cpp (+1/-0)
tests/acceptance-tests/test_session_mediator_report.cpp (+1/-0)
tests/include/mir/test/doubles/mock_display_changer.h (+11/-2)
tests/include/mir/test/doubles/null_display_changer.h (+10/-3)
tests/unit-tests/frontend/test_session_mediator.cpp (+94/-34)
To merge this branch: bzr merge lp://qastaging/~afrantzis/mir/server-side-set-base-display-configuration
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Kevin DuBois (community) Approve
Alan Griffiths Approve
Review via email: mp+275742@code.qastaging.launchpad.net

Commit message

frontend: Support requests to set the base display configuration

Description of the change

frontend: Support requests to set the base display configuration

Note that this MP breaks the server ABI (adds a virtual function to SessionMediatorReport). I will propose the ABI bump separately.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3056
http://jenkins.qa.ubuntu.com/job/mir-ci/5404/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4641
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3548
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4583
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/541/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1558
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1558/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/541
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/541/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4584
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4584/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7206
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24567
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/542/console

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

review: Approve (continuous-integration)
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

Pre-existing and not addressed by this MP - there's really no value to promise/future dance done by set_base_configuration(). We don't need the config to be applied before returning control to the client.

Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

LGTM

review: Approve
Revision history for this message
Kevin DuBois (kdub) wrote :

is returning a future needed by follow up MP's? (If yes, then lgtm)

review: Needs Information
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

> is returning a future needed by follow up MP's? (If yes, then lgtm)

it is a legacy of the obsolete (and confused) behaviour of informing the client of the active config after setting a session config.

Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

> is returning a future needed by follow up MP's? (If yes, then lgtm)

It's not needed, but I didn't want to change the DisplayChanger API in this MP, to keep the MP focused on the SessionMediator additions.

Revision history for this message
Kevin DuBois (kdub) wrote :

ah, alright, lgtm then

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/2057/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4698
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3605
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4640/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/598/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-autolanding/612
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-autolanding/612/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/598
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/598/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4641
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4641/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7261/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24693
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/599/console

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches