webbrowser-app

Merge lp://staging/~osomon/webbrowser-app/single-application into lp://staging/webbrowser-app

  1. single-application
  2. Merge into trunk
Proposed by Olivier Tilloy
Status: Merged
Approved by: Olivier Tilloy
Approved revision: 1335
Merged at revision: 1334
Proposed branch: lp://staging/~osomon/webbrowser-app/single-application
Merge into: lp://staging/webbrowser-app
Diff against target: 652 lines (+393/-57)
14 files modified
src/app/BrowserWindow.qml (+14/-1)
src/app/CMakeLists.txt (+1/-0)
src/app/browserapplication.cpp (+26/-2)
src/app/browserapplication.h (+9/-1)
src/app/single-instance-manager.cpp (+167/-0)
src/app/single-instance-manager.h (+51/-0)
src/app/webbrowser/webbrowser-app.h (+1/-1)
src/app/webbrowser/webbrowser-app.qml (+5/-14)
src/app/webcontainer/webapp-container.cpp (+4/-5)
src/app/webcontainer/webapp-container.qml (+24/-33)
tests/autopilot/webapp_container/tests/__init__.py (+1/-0)
tests/unittests/CMakeLists.txt (+1/-0)
tests/unittests/single-instance-manager/CMakeLists.txt (+17/-0)
tests/unittests/single-instance-manager/tst_SingleInstanceManagerTests.cpp (+72/-0)
To merge this branch: bzr merge lp://staging/~osomon/webbrowser-app/single-application
Reviewer Review Type Date Requested Status
Alexandre Abreu (community) Approve
PS Jenkins bot continuous-integration Needs Fixing
Review via email: mp+282961@code.staging.launchpad.net

Commit message

Ensure that only one instance of the app is running.

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

FAILED: Continuous integration, rev:1334
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2565/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6054
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1318
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1318
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1318/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1318
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4676
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6065
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6065/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26731

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2565/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Alexandre Abreu (abreu-alexandre) wrote :

small question below, but nothing major LGTM

review: Approve
Revision history for this message
Olivier Tilloy (osomon) wrote :

Thanks for the review! Answered your comment inline.

lp://staging/~osomon/webbrowser-app/single-application updated
1335. By Olivier Tilloy

Fix flaky autopilot test by waiting for app to exit before attempting to launch it again.

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

to status/vote changes: