Mir

Merge lp://qastaging/~alan-griffiths/mir/fix-1237710 into lp://qastaging/mir

  1. fix-1237710
  2. Merge into development-branch
Proposed by Alan Griffiths
Status: Merged
Approved by: Daniel van Vugt
Approved revision: no longer in the source branch.
Merged at revision: 1144
Proposed branch: lp://qastaging/~alan-griffiths/mir/fix-1237710
Merge into: lp://qastaging/mir
Diff against target: 11 lines (+3/-0)
1 file modified
src/server/run_mir.cpp (+3/-0)
To merge this branch: bzr merge lp://qastaging/~alan-griffiths/mir/fix-1237710
Reviewer Review Type Date Requested Status
Daniel van Vugt Approve
Robert Carr (community) Abstain
PS Jenkins bot (community) continuous-integration Approve
Alexandros Frantzis (community) Abstain
Kevin DuBois (community) Approve
Review via email: mp+191412@code.qastaging.launchpad.net

Commit message

Fix failing acceptance-test:
ServerShutdown/OnSignal.removes_endpoint_on_signal (LP: #1237710)

Avoid fatal_signal_cleanup getting caught in a loop restoring itself and
then re-entering itself. This could happen in some permutations of
acceptance-tests where run_mir is entered with fatal_signal_cleanup already
set up from previous tests' server instances.

Description of the change

run_mir: restore signals handlers after the server exits.

To post a comment you must log in.
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

Of course, this doesn't restore the handlers if an exception propagates out of server.run(). There's a longer version that handles this:

https://code.launchpad.net/~alan-griffiths/mir/raii-fix-1237710/+merge/191420

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

FAILED: Continuous integration, rev:1139
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/182/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/2390
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/2275
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/179/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/mir-team-mir-development-branch-ci/182/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Kevin DuBois (kdub) :
review: Approve
Revision history for this message
Alexandros Frantzis (afrantzis) :
review: Abstain
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1139
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/184/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/2394
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/2279
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/181
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/181/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/mir-team-mir-development-branch-ci/184/rebuild

review: Approve (continuous-integration)
Revision history for this message
Robert Carr (robertcarr) :
review: Abstain
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

It works too.

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