QtMir

Merge lp://staging/~nick-dedekind/qtmir/1355173.trust-prompt-suspend into lp://staging/qtmir

  1. 1355173.trust-prompt-suspend
  2. Merge into trunk
Proposed by Nick Dedekind
Status: Merged
Approved by: Gerry Boland
Approved revision: 281
Merged at revision: 300
Proposed branch: lp://staging/~nick-dedekind/qtmir/1355173.trust-prompt-suspend
Merge into: lp://staging/qtmir
Prerequisite: lp://staging/~nick-dedekind/qtmir/mir-0.10.0-compatibility
Diff against target: 117 lines (+73/-2)
3 files modified
src/modules/Unity/Application/session.cpp (+14/-1)
tests/modules/SessionManager/session_test.cpp (+58/-0)
tests/modules/common/mock_mir_session.h (+1/-1)
To merge this branch: bzr merge lp://staging/~nick-dedekind/qtmir/1355173.trust-prompt-suspend
Reviewer Review Type Date Requested Status
Gerry Boland (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+245750@code.staging.launchpad.net

This proposal supersedes a proposal from 2014-11-19.

Commit message

Notify prompt sessions that sessions have been suspended/resumed.

Description of the change

 * Are there any related MPs required for this MP to build/function as expected? Please list.
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
No

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

FAILED: Continuous integration, rev:276
http://jenkins.qa.ubuntu.com/job/qtmir-ci/154/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/5/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/5/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Gerry Boland (gerboland) wrote : Posted in a previous version of this proposal

Code looks reasonable, I didn't test though

review: Approve (code)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:277
http://jenkins.qa.ubuntu.com/job/qtmir-ci/158/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/9/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:277
http://jenkins.qa.ubuntu.com/job/qtmir-ci/186/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/37/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/37/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Gerry Boland (gerboland) wrote :

Again, code is reasonable. Need to functional test

review: Approve (code)
Revision history for this message
Gerry Boland (gerboland) wrote :

Please merge qtmir trunk. Note you also need to do this: http://pastebin.ubuntu.com/9698152/ to have it build.

Just building to test now.

review: Needs Fixing
Revision history for this message
Gerry Boland (gerboland) wrote :

Manual Testing brought up no issues, functionally it looks good to me

review: Approve (functional)
Revision history for this message
Gerry Boland (gerboland) :
review: Needs Fixing (code)
lp://staging/~nick-dedekind/qtmir/1355173.trust-prompt-suspend updated
280. By Nick Dedekind

mirConfig->mirServer

281. By Nick Dedekind

merged with trunk

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

PASSED: Continuous integration, rev:281
http://jenkins.qa.ubuntu.com/job/qtmir-ci/189/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/40
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/40
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/40/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Gerry Boland (gerboland) wrote :

Good to go

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Y
 * Did CI run pass? If not, please explain why.
Is fine

review: Approve

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