Merge lp:~gang65/ubuntu-system-settings/ubuntu-system-settings-remove-retry-button into lp:ubuntu-system-settings

[Bartosz Kosiorek]

Remove "Retry" button, when no internet connection is available.
It will automatically retry after establishing connection (LP: #1479447)

Remove "Retry" button, when no internet connection is available.
It will automatically retry after establishing connection (LP: #1479447)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1545
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2447/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4798
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/222
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/631
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3866
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4795
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4795/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24529

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

review: Needs Fixing (continuous-integration)

[Sebastien Bacher (seb128)]

Thanks but if you remove that component you need to update the anchors of the Label which is currently positioning to the left of the button when that one is displayed (that's likely why the CI failed as well there)

review: Needs Fixing

[lp:~gang65/ubuntu-system-settings/ubuntu-system-settings-remove-retry-button]

1546. By Bartosz Kosiorek on 2015-10-28

Fix anchors

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1546
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2453/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4874
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/228
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/637
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3920
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4871
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4871/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24629

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

review: Needs Fixing (continuous-integration)

[Bartosz Kosiorek (gang65)]

Unfortunately I don't know why it is failing.

On my second MR, which is adding only README file, the problem is similar:
https://code.launchpad.net/~gang65/ubuntu-system-settings/ubuntu-system-settings-readme-fix/+merge/274811

Traceback (most recent call last):
  File "/usr/lib/python3/dist-packages/ubuntu_system_settings/tests/test_system_updates.py", line 65, in test_check_for_updates_area
    Eventually(NotEquals(True)))
  File "/usr/lib/python3/dist-packages/testtools/testcase.py", line 423, in assertThat
    raise mismatch_error
testtools.matchers._impl.MismatchError: After 10.0 seconds test on Base.visible failed: True == dbus.Boolean(True, variant_level=1)

review: Needs Information

[Jonas G. Drange (jonas-drange)]

On 28 October 2015 at 09:28, Bartosz Kosiorek <email address hidden> wrote:

> Review: Needs Information
>
> Unfortunately I don't know why it is failing.
>
> ​
Sorry, these tests are currently failing on all branches.​

[Ken VanDine (ken-vandine)]

Thanks, looks good!

review: Approve

[Bartosz Kosiorek (gang65)]

The code has been already approved. When it will be merged?

review: Needs Information

=== modified file 'plugins/system-update/PageComponent.qml'
--- plugins/system-update/PageComponent.qml	2015-09-18 14:18:11 +0000
+++ plugins/system-update/PageComponent.qml	2015-10-28 00:57:48 +0000
@@ -283,31 +283,12 @@
                     anchors {
                         left: activity.running ? activity.right : parent.left
                         top: parent.top
-                        right: btnRetry.visible ? btnRetry.left : parent.right
+                        right: parent.right
                         rightMargin: units.gu(2)
                         leftMargin: units.gu(2)
                     }
                     height: parent.height
                 }
-
-                Button {
-                    id: btnRetry
-                    text: i18n.tr("Retry")
-                    color: UbuntuColors.orange
-                    anchors {
-                        right: parent.right
-                        top: parent.top
-                        bottom: parent.bottom
-                        margins: units.gu(1)
-                    }
-                    visible: !activity.visible
-
-                    onClicked: {
-                        activity.running = true;
-                        root.state = "SEARCHING";
-                        UpdateManager.checkUpdates();
-                    }
-                }
             }
 
             ListItem.SingleControl {