ubuntu-system-settings

Merge lp://staging/~jonas-drange/ubuntu-system-settings/cellular-split-radio-pref-and-data-fix-1378812 into lp://staging/ubuntu-system-settings

cellular-split-radio-pref-and-data-fix-1378812
Merge into trunk

Proposed by Jonas G. Drange on 2014-10-14

Status:

Merged

Approved by:

Ken VanDine on 2014-10-29

Approved revision:

1133

Merged at revision:

1166

Proposed branch:

lp://staging/~jonas-drange/ubuntu-system-settings/cellular-split-radio-pref-and-data-fix-1378812

Merge into:

lp://staging/ubuntu-system-settings

Prerequisite:

lp://staging/~jonas-drange/ubuntu-system-settings/cellular-data-not-preserved-after-fm-fixes-1376957

Diff against target:

1905 lines (+580/-882)

15 files modified

plugins/cellular/Components/CMakeLists.txt (+5/-5)
plugins/cellular/Components/CellularSingleSim.qml (+0/-115)
plugins/cellular/Components/DataMultiSim.qml (+6/-119)
plugins/cellular/Components/MultiSim.qml (+52/-10)
plugins/cellular/Components/NoSim.qml (+5/-12)
plugins/cellular/Components/RadioSingleSim.qml (+57/-0)
plugins/cellular/Components/SimEditor.qml (+31/-14)
plugins/cellular/Components/SingleSim.qml (+34/-4)
plugins/cellular/PageChooseCarrier.qml (+3/-2)
plugins/cellular/PageChooseCarriers.qml (+2/-2)
plugins/cellular/PageComponent.qml (+2/-2)
plugins/cellular/sims.js (+10/-0)
tests/autopilot/ubuntu_system_settings/__init__.py (+164/-1)
tests/autopilot/ubuntu_system_settings/tests/__init__.py (+7/-3)
tests/autopilot/ubuntu_system_settings/tests/test_cellular.py (+202/-593)

To merge this branch:

bzr merge lp://staging/~jonas-drange/ubuntu-system-settings/cellular-split-radio-pref-and-data-fix-1378812

Related bugs:

Bug #1361226: Cellular autopilot tests needs to be refactored	Low	Fix Released
Bug #1377455: [System Settings] Difficult to edit SIM name	High	Fix Released
Bug #1378812: [cellular] The radio preference setting and data traffic setting design causes problems*	High	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Ken VanDine		2014-10-14	Approve on 2014-10-29
PS Jenkins bot	continuous-integration	2014-10-14	Approve on 2014-10-29
Review via email: mp+238304@code.staging.launchpad.net

Commit message

[cellular] split "Cellular Data" and "Connection type" into two separate pieces in the UI for both single and multi SIM

Description of the change

This split is mainly about making the Radio Technology (2g, 3g, etc.) preference selector it's own selector, not tied to whether or not cellular data is used. This is due to the setting having an impact on both voice calls as well as cellular data.

Note that for multi SIM users, the selector will be hidden when cellular data is off. See bug 1383368.

Testplans here: http://pastebin.ubuntu.com/8734645/ and http://pastebin.ubuntu.com/8734648/

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-14:

#

FAILED: Continuous integration, rev:1124
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1635/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5925
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4079
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/827
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5566
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7177
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7177/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14658
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3441
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4408
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4408/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-20:

#

FAILED: Continuous integration, rev:1126
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1660/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6063
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4141
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/852
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5694
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7315
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7315/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14863
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3502
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4484
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4484/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-20:

#

FAILED: Continuous integration, rev:1127
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1662/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6070/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4144
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/854
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5699/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7322
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7322/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14869
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3505
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4487
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4487/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-21:

#

FAILED: Continuous integration, rev:1127
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1666/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6094
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4153
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/858
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5726
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7346
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7346/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14902
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3514
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4497
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4497/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-23:

#

FAILED: Continuous integration, rev:1128
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1677/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6156/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4180
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/869
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5784/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7408
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7408/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14989
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3540
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4533
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4533/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

lp://staging/~jonas-drange/ubuntu-system-settings/cellular-split-radio-pref-and-data-fix-1378812 updated on 2014-10-23

1129. By Jonas G. Drange on 2014-10-23: merge trunk
1130. By Jonas G. Drange on 2014-10-23: selectedIndex needs to be set

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-23:

#

FAILED: Continuous integration, rev:1128
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1679/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6163
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4182
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/871
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5789
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7415
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7415/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15000
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3542
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4535
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4535/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-23:

#

FAILED: Continuous integration, rev:1130
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1684/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6174
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4189/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/876
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5799
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7426
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7426/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15011
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4543
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4543/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

lp://staging/~jonas-drange/ubuntu-system-settings/cellular-split-radio-pref-and-data-fix-1378812 updated on 2014-10-28

1131. By Jonas G. Drange on 2014-10-28: merge trunK
1132. By Jonas G. Drange on 2014-10-28: up to spec

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-28:

#

FAILED: Continuous integration, rev:1132
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1701/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6257
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4214
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/893
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5871
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7509
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7509/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15138
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3571
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4593
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4593/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Jonas G. Drange (jonas-drange) wrote on 2014-10-28:

#

I need to look into https://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3571/testReport/junit/ubuntu_system_settings.tests.test_cellular/DualSimCellularTestCase/test_change_sim2_name/

Might be a test issue, but that part of the test has not changed in months. Looking into it.

lp://staging/~jonas-drange/ubuntu-system-settings/cellular-split-radio-pref-and-data-fix-1378812 updated on 2014-10-29

1133. By Jonas G. Drange on 2014-10-29: don't except any value in that setting

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-29:

#

PASSED: Continuous integration, rev:1133
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1708/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6285
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4222
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/900
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5895
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7537
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7537/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15181
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3579
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4602
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4602/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

Revision history for this message

Ken VanDine (ken-vandine) wrote on 2014-10-29:

#

Lots of good stuff here, love to see the test fixes!

review: Approve

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 all changes:

Jonas G. Drange

Ubuntu Touch System Settings