Merge lp://staging/~ken-vandine/ubuntu-system-settings/no_updates_click_system_image into lp://staging/ubuntu-system-settings

Proposed by Ken VanDine
Status: Merged
Approved by: Jonas G. Drange
Approved revision: 1783
Merged at revision: 1766
Proposed branch: lp://staging/~ken-vandine/ubuntu-system-settings/no_updates_click_system_image
Merge into: lp://staging/ubuntu-system-settings
Diff against target: 19463 lines (+21/-17163)
163 files modified
CMakeLists.txt (+0/-2)
debian/control (+1/-6)
debian/rules (+1/-1)
debian/ubuntu-system-settings.install (+0/-1)
plugins/CMakeLists.txt (+2/-3)
plugins/about/CMakeLists.txt (+1/-3)
plugins/about/PageComponent.qml (+0/-61)
plugins/about/Storage.qml (+13/-61)
plugins/about/click.cpp (+0/-322)
plugins/about/click.h (+0/-82)
plugins/about/plugin.cpp (+0/-14)
plugins/about/storageabout.cpp (+0/-28)
plugins/about/storageabout.h (+0/-23)
plugins/system-update/CMakeLists.txt (+0/-88)
plugins/system-update/ChangelogExpander.qml (+0/-77)
plugins/system-update/ClickUpdateDelegate.qml (+0/-26)
plugins/system-update/Configuration.qml (+0/-61)
plugins/system-update/DownloadHandler.qml (+0/-204)
plugins/system-update/EntryComponent.qml (+0/-72)
plugins/system-update/Global.qml (+0/-145)
plugins/system-update/ImageUpdatePrompt.qml (+0/-52)
plugins/system-update/InstallationFailed.qml (+0/-34)
plugins/system-update/NotAuthenticatedNotification.qml (+0/-62)
plugins/system-update/PageComponent.qml (+0/-480)
plugins/system-update/UpdateDelegate.qml (+0/-412)
plugins/system-update/click/apiclient.h (+0/-67)
plugins/system-update/click/apiclient_impl.cpp (+0/-215)
plugins/system-update/click/apiclient_impl.h (+0/-56)
plugins/system-update/click/manager.h (+0/-67)
plugins/system-update/click/manager_impl.cpp (+0/-569)
plugins/system-update/click/manager_impl.h (+0/-122)
plugins/system-update/click/manifest.h (+0/-47)
plugins/system-update/click/manifest_impl.cpp (+0/-97)
plugins/system-update/click/manifest_impl.h (+0/-47)
plugins/system-update/click/sessiontoken.h (+0/-42)
plugins/system-update/click/sessiontoken_impl.cpp (+0/-48)
plugins/system-update/click/sessiontoken_impl.h (+0/-48)
plugins/system-update/click/sso.h (+0/-56)
plugins/system-update/click/sso_impl.cpp (+0/-55)
plugins/system-update/click/sso_impl.h (+0/-54)
plugins/system-update/click/tokendownloader.h (+0/-74)
plugins/system-update/click/tokendownloader_factory.h (+0/-44)
plugins/system-update/click/tokendownloader_factory_impl.cpp (+0/-36)
plugins/system-update/click/tokendownloader_factory_impl.h (+0/-37)
plugins/system-update/click/tokendownloader_impl.cpp (+0/-81)
plugins/system-update/click/tokendownloader_impl.h (+0/-47)
plugins/system-update/helpers.cpp (+0/-108)
plugins/system-update/helpers.h (+0/-47)
plugins/system-update/image/imagemanager.h (+0/-46)
plugins/system-update/image/imagemanager_impl.cpp (+0/-188)
plugins/system-update/image/imagemanager_impl.h (+0/-67)
plugins/system-update/network/accessmanager.h (+0/-46)
plugins/system-update/network/accessmanager_impl.cpp (+0/-47)
plugins/system-update/network/accessmanager_impl.h (+0/-41)
plugins/system-update/plugin.cpp (+0/-61)
plugins/system-update/plugin.h (+0/-35)
plugins/system-update/qmldir.in (+0/-2)
plugins/system-update/settings-system-update.svg (+0/-87)
plugins/system-update/system-update.settings (+0/-23)
plugins/system-update/update-notification.settings (+0/-10)
plugins/system-update/update.cpp (+0/-482)
plugins/system-update/update.h (+0/-229)
plugins/system-update/updatedb.cpp (+0/-418)
plugins/system-update/updatedb.h (+0/-77)
plugins/system-update/updatemanager.cpp (+0/-218)
plugins/system-update/updatemanager.h (+0/-120)
plugins/system-update/updatemodel.cpp (+0/-597)
plugins/system-update/updatemodel.h (+0/-177)
src/CMakeLists.txt (+0/-6)
src/systemimage.cpp (+0/-487)
src/systemimage.h (+0/-196)
tests/CMakeLists.txt (+0/-15)
tests/autopilot/ubuntu_system_settings/__init__.py (+0/-141)
tests/autopilot/ubuntu_system_settings/tests/__init__.py (+1/-169)
tests/autopilot/ubuntu_system_settings/tests/test_about.py (+2/-166)
tests/autopilot/ubuntu_system_settings/tests/test_plugins.py (+0/-7)
tests/autopilot/ubuntu_system_settings/tests/test_reset.py (+0/-63)
tests/autopilot/ubuntu_system_settings/tests/test_system_updates.py (+0/-35)
tests/autopilot/ubuntu_system_settings/utils/mock_update_click_server.py (+0/-192)
tests/mocks/SystemSettings/CMakeLists.txt (+0/-20)
tests/mocks/SystemSettings/ListItems/qmldir (+0/-9)
tests/mocks/SystemSettings/MockPluginManager.cpp (+0/-159)
tests/mocks/SystemSettings/MockPluginManager.h (+0/-102)
tests/mocks/SystemSettings/plugin.cpp (+0/-28)
tests/mocks/SystemSettings/plugin.h (+0/-32)
tests/mocks/SystemSettings/qmldir (+0/-9)
tests/mocks/Ubuntu/SystemSettings/CMakeLists.txt (+0/-4)
tests/mocks/Ubuntu/SystemSettings/Launcher/CMakeLists.txt (+0/-20)
tests/mocks/Ubuntu/SystemSettings/Launcher/MockLauncherPanelPlugin.cpp (+0/-57)
tests/mocks/Ubuntu/SystemSettings/Launcher/MockLauncherPanelPlugin.h (+0/-49)
tests/mocks/Ubuntu/SystemSettings/Launcher/plugin.cpp (+0/-37)
tests/mocks/Ubuntu/SystemSettings/Launcher/plugin.h (+0/-32)
tests/mocks/Ubuntu/SystemSettings/Launcher/qmldir (+0/-2)
tests/mocks/Ubuntu/SystemSettings/Notifications/CMakeLists.txt (+0/-22)
tests/mocks/Ubuntu/SystemSettings/Notifications/MockClickApplicationsModel.cpp (+0/-102)
tests/mocks/Ubuntu/SystemSettings/Notifications/MockClickApplicationsModel.h (+0/-33)
tests/mocks/Ubuntu/SystemSettings/Notifications/MockClickApplicationsNotifyModel.cpp (+0/-35)
tests/mocks/Ubuntu/SystemSettings/Notifications/MockClickApplicationsNotifyModel.h (+0/-37)
tests/mocks/Ubuntu/SystemSettings/Notifications/plugin.cpp (+0/-37)
tests/mocks/Ubuntu/SystemSettings/Notifications/plugin.h (+0/-31)
tests/mocks/Ubuntu/SystemSettings/Notifications/qmldir (+0/-2)
tests/mocks/Ubuntu/SystemSettings/Update/CMakeLists.txt (+0/-31)
tests/mocks/Ubuntu/SystemSettings/Update/MockSystemImage.cpp (+0/-120)
tests/mocks/Ubuntu/SystemSettings/Update/MockSystemImage.h (+0/-91)
tests/mocks/Ubuntu/SystemSettings/Update/MockUpdateManager.cpp (+0/-48)
tests/mocks/Ubuntu/SystemSettings/Update/MockUpdateManager.h (+0/-39)
tests/mocks/Ubuntu/SystemSettings/Update/MockUpdateModel.cpp (+0/-44)
tests/mocks/Ubuntu/SystemSettings/Update/MockUpdateModel.h (+0/-48)
tests/mocks/Ubuntu/SystemSettings/Update/plugin.cpp (+0/-62)
tests/mocks/Ubuntu/SystemSettings/Update/plugin.h (+0/-33)
tests/mocks/Ubuntu/SystemSettings/Update/qmldir (+0/-2)
tests/mocks/Ubuntu/SystemSettings/Wifi/CMakeLists.txt (+0/-26)
tests/mocks/Ubuntu/SystemSettings/Wifi/MockCertHandler.cpp (+0/-103)
tests/mocks/Ubuntu/SystemSettings/Wifi/MockCertHandler.h (+0/-92)
tests/mocks/Ubuntu/SystemSettings/Wifi/MockDbusHelper.cpp (+0/-76)
tests/mocks/Ubuntu/SystemSettings/Wifi/MockDbusHelper.h (+0/-57)
tests/mocks/Ubuntu/SystemSettings/Wifi/plugin.cpp (+0/-42)
tests/mocks/Ubuntu/SystemSettings/Wifi/plugin.h (+0/-32)
tests/mocks/Ubuntu/SystemSettings/Wifi/qmldir (+0/-2)
tests/mocks/plugins/system-update/fakeapiclient.h (+0/-78)
tests/mocks/plugins/system-update/fakeclickmanager.h (+0/-96)
tests/mocks/plugins/system-update/fakeimagemanager.h (+0/-59)
tests/mocks/plugins/system-update/fakemanifest.h (+0/-52)
tests/mocks/plugins/system-update/fakesessiontoken.h (+0/-53)
tests/mocks/plugins/system-update/fakesso.h (+0/-62)
tests/mocks/plugins/system-update/faketokendownloader.h (+0/-69)
tests/mocks/plugins/system-update/faketokendownloader_factory.h (+0/-52)
tests/mocks/system-image-dbus/fakesystemimagedbus.cpp (+0/-45)
tests/mocks/system-image-dbus/fakesystemimagedbus.h (+0/-64)
tests/plugins/CMakeLists.txt (+0/-27)
tests/plugins/notifications/CMakeLists.txt (+0/-40)
tests/plugins/notifications/NotificationsSource/qmldir (+0/-5)
tests/plugins/notifications/tst_ClickAppNotifications.qml (+0/-117)
tests/plugins/notifications/tst_ClickAppsSoundsNotify.qml (+0/-78)
tests/plugins/notifications/tst_ClickAppsVibrationsNotify.qml (+0/-78)
tests/plugins/notifications/tst_PageComponent.qml (+0/-167)
tests/plugins/notifications/tst_QmlTests.cpp (+0/-21)
tests/plugins/system-update/CMakeLists.txt (+0/-86)
tests/plugins/system-update/Source/qmldir (+0/-9)
tests/plugins/system-update/click.result (+0/-35)
tests/plugins/system-update/mockclickcommand (+0/-15)
tests/plugins/system-update/mockclickserver.h (+0/-57)
tests/plugins/system-update/mockclickserver.py (+0/-220)
tests/plugins/system-update/tst_clickclient.cpp (+0/-165)
tests/plugins/system-update/tst_clickmanager.cpp (+0/-571)
tests/plugins/system-update/tst_clickmanifest.cpp (+0/-100)
tests/plugins/system-update/tst_helpers.cpp (+0/-71)
tests/plugins/system-update/tst_imagemanager.cpp (+0/-269)
tests/plugins/system-update/tst_systemupdate_download_handler.qml (+0/-230)
tests/plugins/system-update/tst_systemupdate_entrycomponent.qml (+0/-109)
tests/plugins/system-update/tst_systemupdate_global.qml (+0/-308)
tests/plugins/system-update/tst_systemupdate_noauthentication.qml (+0/-71)
tests/plugins/system-update/tst_systemupdate_pagecomponent.qml (+0/-379)
tests/plugins/system-update/tst_systemupdate_update.qml (+0/-374)
tests/plugins/system-update/tst_systemupdate_update_visuals.qml (+0/-219)
tests/plugins/system-update/tst_tokendownloader.cpp (+0/-107)
tests/plugins/system-update/tst_update.cpp (+0/-317)
tests/plugins/system-update/tst_updatedb.cpp (+0/-303)
tests/plugins/system-update/tst_updatemanager.cpp (+0/-195)
tests/plugins/system-update/tst_updatemodel.cpp (+0/-681)
tests/plugins/system-update/ubuntu-sdk-15.04.framework (+0/-2)
tests/test_push_helper.py.in (+0/-188)
tests/tst_systemimage.cpp (+0/-280)
To merge this branch: bzr merge lp://staging/~ken-vandine/ubuntu-system-settings/no_updates_click_system_image
Reviewer Review Type Date Requested Status
Jonas G. Drange (community) Approve
system-apps-ci-bot continuous-integration Approve
Review via email: mp+319977@code.staging.launchpad.net

Commit message

Drop everything that needs system-image or click

Description of the change

Drop everything that needs system-image or click

To post a comment you must log in.
1774. By Ken VanDine

dropped system-update

1775. By Ken VanDine

Dropped notification tests

1776. By Ken VanDine

Don't build depend on libubuntuoneauth-2.0-dev

1777. By Ken VanDine

Removed system-update tests

1778. By Ken VanDine

fixed dh_auto_test

1779. By Ken VanDine

Re-added removed SystemSettings mock

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :
review: Needs Fixing (continuous-integration)
1780. By Ken VanDine

drop build dep for libubuntu-app-launch3-dev

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :
review: Needs Fixing (continuous-integration)
1781. By Ken VanDine

disable tests for ppc64el amd s390x as well

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :
review: Needs Fixing (continuous-integration)
1782. By Ken VanDine

readded the SystemSettings mock

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

PASSED: Continuous integration, rev:1782
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/12/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/2325
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2324
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2146
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2146/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2146
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2146/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2146
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2146/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2146
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2146/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2146
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2146/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2146
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2146/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
1783. By Ken VanDine

Added Storage back to the about panel and remove click related details

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

PASSED: Continuous integration, rev:1783
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/14/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/2327
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2326
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2148
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2148/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2148
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2148/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2148
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2148/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2148
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2148/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2148
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2148/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2148
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2148/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Jonas G. Drange (jonas-drange) wrote :

LGTM! Storage panel works!

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