Merge lp:~jonas-drange/ubuntu-system-settings/about-dynamic-imei-fixes-1205294 into lp:ubuntu-system-settings

[Jonas G. Drange]

[about] properly display IMEI values for no devices ("None"), one device and multiple devices. Remove test now redundant.

Shows multiple IMEIs in a multivalue list according to spec [1].

I have removed the test that has become redundant by doing this.

[1] https://wiki.ubuntu.com/AboutThisDevice#phone

[Sebastien Bacher (seb128)]

Thanks, is the gsettings/simnames snippet part of that changeset or some other work? It doesn't seme required for emei display...

Otherwise looks fine, might be better to only have 2 items though? The first one could have "visible: length <= 1" and "value: length = 1 ? imei : "none""

The second point is not a blocker, mostly a matter of taste so feel free to keep your version

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1208
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1793/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/245
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/159/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/63
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/221
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/245
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/245/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15902
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/138/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/163
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/163/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Jonas G. Drange (jonas-drange)]

Thanks @seb128, that was indeed part of an older version where SIM names appeared before the relevant IMEI. After talking to mpt, this was changed to no mention of SIM names, which makes more sense.

[Sebastien Bacher (seb128)]

Thanks, small nitpick

> value: modemsSorted.length ? (imeiNumber || i18n.tr("None"))

the (imeiNumber || i18n.tr("None")) doesn't seem an obvious syntax to me, what would think of using
"value (modemsSorted.length && imeiNumber) ? imeiNumber : i18n.tr("None"))"
instead?

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1211
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1806/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/274
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/188/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/76
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/249
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/274
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/274/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15993
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/165/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/192
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/192/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1211
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1809/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/310
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/208/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/79
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/283
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/310
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/310/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16109
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/182/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/212
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/212/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Sebastien Bacher (seb128)]

Looks fine to me, but do you have any clue with those CI tests are failing?

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1211
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1817/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/376
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/87
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/338
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/376
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/376/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16275

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1211
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1825/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/424
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/94
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/374
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/424
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/424/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16358

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

review: Needs Fixing (continuous-integration)

[Sebastien Bacher (seb128)]

The tests failing is issues with the CI machines, the changes look good so let's approve it

review: Approve

=== modified file 'plugins/about/PageComponent.qml'
--- plugins/about/PageComponent.qml	2014-10-31 14:53:32 +0000
+++ plugins/about/PageComponent.qml	2014-11-19 12:03:52 +0000
@@ -33,6 +33,7 @@
 
     title: i18n.tr("About this phone")
     flickable: scrollWidget
+    property var modemsSorted: manager.modems.slice(0).sort()
 
     UbuntuStorageAboutPanel {
         id: backendInfos
@@ -52,7 +53,7 @@
             if (manager.modems.length === 1) {
                 phoneNumbers.setSource("PhoneNumber.qml", {path: manager.modems[0]})
             } else if (manager.modems.length > 1) {
-                phoneNumbers.setSource("PhoneNumbers.qml", {paths: manager.modems.slice(0).sort()})
+                phoneNumbers.setSource("PhoneNumbers.qml", {paths: modemsSorted})
             }
         }
     }
@@ -117,8 +118,23 @@
                 property string imeiNumber
                 imeiNumber: deviceInfos.imei(0)
                 text: "IMEI"
-                value: imeiNumber
-                visible: imeiNumber
+                value: modemsSorted.length ? (imeiNumber || i18n.tr("None")) :
+                    i18n.tr("None")
+                visible: modemsSorted.length <= 1
+            }
+
+            ListItem.MultiValue {
+                text: "IMEI"
+                objectName: "imeiItems"
+                values: {
+                    var imeis = [];
+                    modemsSorted.forEach(function (path, i) {
+                        var imei = deviceInfos.imei(i);
+                        imei ? imeis.push(imei) : imeis.push(i18n.tr("None"));
+                    });
+                    return imeis;
+                }
+                visible: modemsSorted.length > 1
             }
 
             ListItem.SingleValue {

=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_about.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_about.py	2014-09-03 14:48:02 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_about.py	2014-11-19 12:03:52 +0000
@@ -132,13 +132,6 @@
             displayed_imei = self.about_page.get_imei()
             self.assertThat(displayed_imei, Equals(device_imei))
 
-    def test_device_without_imei_must_not_display_it(self):
-        device_imei = self._get_imei_from_dbus()
-        if device_imei:
-            self.skipTest('The device has imei.')
-        else:
-            self.assertFalse(self.about_page.is_imei_visible())
-
     def test_phone_number(self):
         number = self.system_settings.main_view.about_page.select_single(
             objectName="numberItem"