The Sound Menu

Merge lp:~xavi-garcia-mena/indicator-sound/remove-warning-message-in-volume-notification into lp:indicator-sound/15.10

  1. remove-warning-message-in-volume-notification
  2. Merge into trunk.15.10
Proposed by Xavi Garcia
Status: Merged
Approved by: Charles Kerr
Approved revision: 515
Merged at revision: 508
Proposed branch: lp:~xavi-garcia-mena/indicator-sound/remove-warning-message-in-volume-notification
Merge into: lp:indicator-sound/15.10
Prerequisite: lp:~xavi-garcia-mena/indicator-sound/bluetooth-usb-hdmi-labels-with-tests
Diff against target: 574 lines (+146/-109)
12 files modified
debian/changelog (+7/-0)
debian/control (+0/-11)
src/CMakeLists.txt (+2/-1)
src/service.vala (+39/-44)
tests/CMakeLists.txt (+4/-3)
tests/dbus-types/org.freedesktop.Accounts.xml (+1/-0)
tests/integration/indicator-sound-test-base.cpp (+22/-6)
tests/integration/indicator-sound-test-base.h (+14/-0)
tests/integration/test-indicator.cpp (+52/-41)
tests/notifications-test.cc (+2/-2)
tests/service-mocks/accounts-mock/CMakeLists.txt (+1/-1)
tests/service-mocks/accounts-mock/org.freedesktop.Accounts.Mock.xml (+2/-0)
To merge this branch: bzr merge lp:~xavi-garcia-mena/indicator-sound/remove-warning-message-in-volume-notification
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+275278@code.launchpad.net

Commit message

This branch removes the warning message in the volume notification.

Description of the change

This branch removes the warning message in the volume notification.

To post a comment you must log in.
lp:~xavi-garcia-mena/indicator-sound/remove-warning-message-in-volume-notification updated
510. By Xavi Garcia

Include all the integration tests

511. By Xavi Garcia

Update unit test

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

PASSED: Continuous integration, rev:510
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/276/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-wily-amd64-ci/52
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-wily-armhf-ci/52
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-wily-armhf-ci/52/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-sound-ci/276/rebuild

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

FAILED: Continuous integration, rev:511
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/277/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-sound-wily-amd64-ci/53/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-wily-armhf-ci/53
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-wily-armhf-ci/53/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-sound-ci/277/rebuild

review: Needs Fixing (continuous-integration)
lp:~xavi-garcia-mena/indicator-sound/remove-warning-message-in-volume-notification updated
512. By Xavi Garcia

Disabled unit test with race condition issues

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

PASSED: Continuous integration, rev:511
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/278/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-wily-amd64-ci/54
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-wily-armhf-ci/54
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-wily-armhf-ci/54/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-sound-ci/278/rebuild

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

PASSED: Continuous integration, rev:512
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/279/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-wily-amd64-ci/55
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-wily-armhf-ci/55
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-wily-armhf-ci/55/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-sound-ci/279/rebuild

review: Approve (continuous-integration)
lp:~xavi-garcia-mena/indicator-sound/remove-warning-message-in-volume-notification updated
513. By Xavi Garcia

Changed unit test to wait for the indicator to connect the user accounts

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

FAILED: Continuous integration, rev:513
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/281/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-sound-wily-amd64-ci/57/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-wily-armhf-ci/57
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-wily-armhf-ci/57/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-sound-ci/281/rebuild

review: Needs Fixing (continuous-integration)
lp:~xavi-garcia-mena/indicator-sound/remove-warning-message-in-volume-notification updated
514. By Xavi Garcia

changed wait mechanism when stopping sound

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

PASSED: Continuous integration, rev:513
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/282/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-wily-amd64-ci/58
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-wily-armhf-ci/58
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-wily-armhf-ci/58/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-sound-ci/282/rebuild

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

PASSED: Continuous integration, rev:514
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/283/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-wily-amd64-ci/59
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-wily-armhf-ci/59
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-wily-armhf-ci/59/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-sound-ci/283/rebuild

review: Approve (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) wrote :

Overall LGTM.

Comments + questions + minor suggestion inline

review: Needs Information
Revision history for this message
Xavi Garcia (xavi-garcia-mena) wrote :

Charles,

thanks for the review, inline comments updated

lp:~xavi-garcia-mena/indicator-sound/remove-warning-message-in-volume-notification updated
515. By Xavi Garcia

Changes as suggested

Revision history for this message
Charles Kerr (charlesk) :
review: Approve
lp:~xavi-garcia-mena/indicator-sound/remove-warning-message-in-volume-notification updated
516. By Xavi Garcia

Checking capabilites in every notification. This is a workaround as it was observed that when using headphones the capabilities are not correct when we check for the first time

517. By Xavi Garcia

Integration tests updated

518. By Xavi Garcia

Changelog modified

519. By Xavi Garcia

Disable integration tests to avoid universe dependencies

520. By Xavi Garcia

Disable integration tests to avoid universe dependencies

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