Merge lp:~jonas-drange/ubuntu-system-settings/update-cannot-be-ota into lp:ubuntu-system-settings

[Jonas G. Drange]

versionTag refers to the currently installed OTA, not a pending image update, so remove it

[Ken VanDine (ken-vandine)]

looks good

review: Approve

[system-apps-ci-bot (system-apps-ci-bot)]

PASSED: Continuous integration, rev:1698
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/123/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/1269
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/279
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1269
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/1136
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/1136
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/1136
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1123
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1123/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1123
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1123/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1123
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1123/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1123
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1123/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1123
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1123/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1123
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1123/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1123
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1123/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1123
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1123/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1123
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1123/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/123/rebuild

review: Approve (continuous-integration)

=== modified file 'plugins/system-update/PageComponent.qml'
--- plugins/system-update/PageComponent.qml	2016-08-12 12:15:26 +0000
+++ plugins/system-update/PageComponent.qml	2016-08-23 11:49:54 +0000
@@ -221,8 +221,7 @@
                         width: imageUpdateCol.width
                         updateState: model.updateState
                         progress: model.progress
-                        version: SystemImage.versionTag ?
-                                 SystemImage.versionTag : remoteVersion
+                        version: remoteVersion
                         size: model.size
                         changelog: model.changelog
                         error: model.error

=== modified file 'tests/plugins/system-update/tst_systemupdate_pagecomponent.qml'
--- tests/plugins/system-update/tst_systemupdate_pagecomponent.qml	2016-08-12 12:15:26 +0000
+++ tests/plugins/system-update/tst_systemupdate_pagecomponent.qml	2016-08-23 11:49:54 +0000
@@ -302,15 +302,6 @@
                 return !!findChild(testRoot, "installationFailed");
             }, false);
         }
-
-        // OTA updates are branded as such.
-        function test_otaUpdate() {
-            UpdateManager.model.mockAddUpdate("ubuntu", 1, Update.KindImage);
-            SystemImage.mockVersionTag("OTA-1");
-            UpdateManager.cancel();
-            var delegate = findChild(instance, "imageUpdatesDelegate-0");
-            compare(delegate.version, "OTA-1");
-        }
     }
 
     UbuntuTestCase {