Merge lp:~mterry/telephony-service/start-on into lp:telephony-service

Proposed by Michael Terry
Status: Merged
Approved by: Gustavo Pichorim Boiko
Approved revision: 806
Merged at revision: 808
Proposed branch: lp:~mterry/telephony-service/start-on
Merge into: lp:telephony-service
Diff against target: 13 lines (+2/-2)
1 file modified
upstart/telephony-service-indicator.conf (+2/-2)
To merge this branch: bzr merge lp:~mterry/telephony-service/start-on
Reviewer Review Type Date Requested Status
Gustavo Pichorim Boiko (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+216492@code.launchpad.net

Commit message

Tie telephony-service-indicator lifecycle to indicator-messages.

Description of the change

Tie telephony-service-indicator lifecycle to indicator-messages.

The current upstart job just does "start on started unity8". But I noticed that in testing my split greeter branches, the messaging indicator wasn't showing in unity8-greeter (because unity8 isn't present in that session, so telephony-service-indicator never started, so indicator-messages stayed hidden).

I think it makes more sense to switch to starting and stopping based on indicator-messages being up, yeah? Else if you want to continue being explicit, we have a unity8-greeter-started signal you could base off of.

== Checklist ==

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

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
- Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
- Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?
- Didn't try, but I confirmed that it came up as expected in both a normal session and a greeter session. Full test suite seemed overkill for this.

If you changed the UI, was the change specified/approved by design?
- NA

If you changed the packaging (debian), did you subscribe a core-dev to this MP?
-NA

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Michael Terry (mterry) wrote :

I realized that maybe the goal of "started unity8" was to only run in Touch. If so, then maybe do the same thing that indicator-network did:

pre-start script
        # NOTE: Only used on Unity8 today, not 7
        if [ "x$DESKTOP_SESSION" != "xubuntu-touch" ] ; then
                stop; exit 0
        fi
end script

Revision history for this message
Oliver Grawert (ogra) wrote :

better try:

start on started indicator-messages and (xsession SESSION=ubuntu-touch)

that will prevent you from spawning an extra shell and slowing down the startup ...

Revision history for this message
Michael Terry (mterry) wrote :

Poke! This is a blocker for landing the split greeter feature.

Revision history for this message
Gustavo Pichorim Boiko (boiko) wrote :

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

Code looks good and works as expected!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'upstart/telephony-service-indicator.conf'
2--- upstart/telephony-service-indicator.conf 2014-03-24 18:53:27 +0000
3+++ upstart/telephony-service-indicator.conf 2014-04-18 21:22:12 +0000
4@@ -1,8 +1,8 @@
5 description "telephony-service-indicator"
6 author "Tiago Salem Herrmann <tiago.herrmann@canonical.com>"
7
8-start on started unity8
9-stop on session-end
10+start on started indicator-messages
11+stop on stopping indicator-messages
12
13 respawn
14

Subscribers

People subscribed via source and target branches