ubuntu-system-settings

Merge lp://qastaging/~jonas-drange/ubuntu-system-settings/consolidate-connectivity into lp://qastaging/ubuntu-system-settings

consolidate-connectivity
Merge into trunk

Proposed by Jonas G. Drange on 2015-02-19

Status:	Work in progress
Proposed branch:	lp://qastaging/~jonas-drange/ubuntu-system-settings/consolidate-connectivity
Merge into:	lp://qastaging/ubuntu-system-settings
Diff against target:	272 lines (+56/-93) 9 files modified plugins/cellular/CMakeLists.txt (+2/-2) plugins/security-privacy/CMakeLists.txt (+1/-2) plugins/security-privacy/connectivity.cpp (+0/-49) plugins/security-privacy/connectivity.h (+0/-35) src/CMakeLists.txt (+4/-0) src/connectivity.cpp (+16/-0) src/connectivity.h (+3/-2) tests/autopilot/ubuntu_system_settings/tests/__init__.py (+1/-3) tests/autopilot/ubuntu_system_settings/tests/test_security.py (+29/-0)
To merge this branch:	bzr merge lp://qastaging/~jonas-drange/ubuntu-system-settings/consolidate-connectivity
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration	2015-02-19	Needs Fixing on 2015-02-25
Ken VanDine			Needs Fixing on 2015-02-19
Review via email: mp+250347@code.qastaging.launchpad.net

Commit message

[cellular/security] consolidate connectivity APIs, making it a shared USS library

Description of the change

Both Security and Cellular use the private Connectivity API to unlock one or more SIMs. They both have a C++ binding that does this, since they the two panels landed independently.

This branch moves the Connectivity C++ binding out of the respective plugins and makes it a shared one—usable by all plugins.

Needs manual testing of SIM unlocking in Security panel, as well as unlocking after a tech switch (changing has3g on a modem).

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-02-19:

FAILED: Continuous integration, rev:1320
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1989/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1454/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/259/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1452/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1989/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-02-19:

PASSED: Continuous integration, rev:1320
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1991/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1456
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/261
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1290
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1454
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1454/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18216

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1991/rebuild

review: Approve (continuous-integration)

Revision history for this message

Ken VanDine (ken-vandine) wrote on 2015-02-19:

Please add the test back for this

review: Needs Fixing

lp://qastaging/~jonas-drange/ubuntu-system-settings/consolidate-connectivity updated on 2015-02-20

1321. By Jonas G. Drange on 2015-02-19: merge trunk
1322. By Jonas G. Drange on 2015-02-19: re-add previously broken test
1323. By Jonas G. Drange on 2015-02-20: testing theory that we can't have two setupclass calls

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-02-20:

FAILED: Continuous integration, rev:1323
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1993/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1464
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/263
    None: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1298/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1462
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1462/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18228

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1993/rebuild

review: Needs Fixing (continuous-integration)

lp://qastaging/~jonas-drange/ubuntu-system-settings/consolidate-connectivity updated on 2015-02-23

1324. By Jonas G. Drange on 2015-02-23: re-add mixin, move test

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-02-23:

FAILED: Continuous integration, rev:1324
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1996/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1490
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/266
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1324
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1488
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1488/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18284

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1996/rebuild

review: Needs Fixing (continuous-integration)

lp://qastaging/~jonas-drange/ubuntu-system-settings/consolidate-connectivity updated on 2015-02-24

1325. By Jonas G. Drange on 2015-02-24: rewriting test to not include session bus mocking, which in this case seems broken

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-02-24:

PASSED: Continuous integration, rev:1325
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1997/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1503
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/267
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1336
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1501
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1501/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18308

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1997/rebuild

review: Approve (continuous-integration)

lp://qastaging/~jonas-drange/ubuntu-system-settings/consolidate-connectivity updated on 2015-02-24

1326. By Jonas G. Drange on 2015-02-24: OLD FASHIONED MOCK

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-02-24:

PASSED: Continuous integration, rev:1326
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2000/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1510
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/270
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1342
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1508
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1508/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18315

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2000/rebuild

review: Approve (continuous-integration)

lp://qastaging/~jonas-drange/ubuntu-system-settings/consolidate-connectivity updated on 2015-02-25

1327. By Jonas G. Drange on 2015-02-25: mocking the proper way

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-02-25:

FAILED: Continuous integration, rev:1327
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2001/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1511
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/271
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1343
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1509
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1509/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18316

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2001/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

1327. By Jonas G. Drange on 2015-02-25: mocking the proper way
1326. By Jonas G. Drange on 2015-02-24: OLD FASHIONED MOCK
1325. By Jonas G. Drange on 2015-02-24: rewriting test to not include session bus mocking, which in this case seems broken
1324. By Jonas G. Drange on 2015-02-23: re-add mixin, move test
1323. By Jonas G. Drange on 2015-02-20: testing theory that we can't have two setupclass calls
1322. By Jonas G. Drange on 2015-02-19: re-add previously broken test
1321. By Jonas G. Drange on 2015-02-19: merge trunk
1320. By Jonas G. Drange on 2015-02-19: make connectivity a shared uss library