location-service

Merge lp://staging/~thomas-voss/location-service/allow-for-disabling-providers into lp://staging/location-service/trunk

  1. allow-for-disabling-providers
  2. Merge into trunk
Proposed by Thomas Voß
Status: Merged
Approved by: Loïc Minier
Approved revision: 155
Merged at revision: 162
Proposed branch: lp://staging/~thomas-voss/location-service/allow-for-disabling-providers
Merge into: lp://staging/location-service/trunk
Prerequisite: lp://staging/~thomas-voss/location-service/make-engine-state-persistent-across-boots-and-otas
Diff against target: 389 lines (+221/-17)
6 files modified
include/location_service/com/ubuntu/location/provider.h (+15/-3)
src/location_service/com/ubuntu/location/engine.cpp (+44/-11)
src/location_service/com/ubuntu/location/provider.cpp (+45/-1)
src/location_service/com/ubuntu/location/providers/remote/provider.cpp (+1/-1)
tests/engine_test.cpp (+84/-1)
tests/provider_test.cpp (+32/-0)
To merge this branch: bzr merge lp://staging/~thomas-voss/location-service/allow-for-disabling-providers
Reviewer Review Type Date Requested Status
Loïc Minier (community) Approve
PS Jenkins bot continuous-integration Needs Fixing
Review via email: mp+246096@code.staging.launchpad.net

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

Commit message

Allow for enabling/disabling providers.
Wire up engine state changes to enabling/disabling of providers.

Description of the change

Allow for enabling/disabling providers.
Wire up engine state changes to enabling/disabling of providers.

To post a comment you must log in.
Revision history for this message
Loïc Minier (lool) wrote : Posted in a previous version of this proposal

Looks really clean; I see the default is enabled, I guess I need to test that config updates actually trigger enabling/disabling as designed

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

FAILED: Continuous integration, rev:152
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~thomas-voss/location-service/allow-for-disabling-providers/+merge/241707/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/location-service-ci/335/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-amd64-ci/7/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/7/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-i386-ci/7

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/335/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Loïc Minier (lool) wrote : Posted in a previous version of this proposal

I guess this is only useful combined with https://code.launchpad.net/~thomas-voss/location-service/make-engine-state-persistent-across-boots-and-otas/+merge/241784

lp://staging/~thomas-voss/location-service/allow-for-disabling-providers updated
153. By Thomas Voß

Merge pre-requisite branch.
Fix FTBFS in test cases.

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

FAILED: Continuous integration, rev:152
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~thomas-voss/location-service/allow-for-disabling-providers/+merge/246096/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/location-service-ci/340/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/12
        deb: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/12/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-i386-ci/12

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/340/rebuild

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

FAILED: Continuous integration, rev:153
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~thomas-voss/location-service/allow-for-disabling-providers/+merge/246096/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/location-service-ci/342/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/14
        deb: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/14/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-i386-ci/14

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/342/rebuild

review: Needs Fixing (continuous-integration)
lp://staging/~thomas-voss/location-service/allow-for-disabling-providers updated
154. By Thomas Voß

Refactor the change to make it ABI stable.

155. By Thomas Voß

Make enable and disable non-virtual for now.

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

FAILED: Continuous integration, rev:155
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~thomas-voss/location-service/allow-for-disabling-providers/+merge/246096/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/location-service-ci/343/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-amd64-ci/15/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/15/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-i386-ci/15

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/343/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Loïc Minier (lool) wrote :

Changes look good

review: Approve
lp://staging/~thomas-voss/location-service/allow-for-disabling-providers updated
156. By Thomas Voß

Make sure that the provider is really stopped when disabling it.

Revision history for this message
Loïc Minier (lool) :
review: Approve
lp://staging/~thomas-voss/location-service/allow-for-disabling-providers updated
157. By Thomas Voß

Only stop provider updates if they have been running.

158. By Thomas Voß

Anything lt 0 means: Provider is disabled.

159. By Thomas Voß

Make sure that we only enable providers that really should be enabled.

160. By Thomas Voß

Need this as context of the lamdba.

161. By Thomas Voß

Revert auto-enablement.

162. By Thomas Voß

A minor niggle.

163. By Thomas Voß

Merge pre-req branch.

164. By Thomas Voß

Make sure that newly added providers are disabled, too.

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