1
=== modified file 'plugins/system-update/PageComponent.qml'
2
--- plugins/system-update/PageComponent.qml	2014-03-17 02:08:47 +0000
3
+++ plugins/system-update/PageComponent.qml	2014-04-09 18:08:02 +0000
4
@@ -35,6 +35,7 @@
5
35
    title: i18n.tr("Updates")
35
    title: i18n.tr("Updates")
6
36
36
7
37
    property bool installAll: false
37
    property bool installAll: false
8
38
    property bool updatesDownloaded: false
9
38
    property int updatesAvailable: 0
39
    property int updatesAvailable: 0
10
39
40
11
40
    DeviceInfo {
41
    DeviceInfo {
12
@@ -45,11 +46,13 @@
13
45
         id: dialogInstallComponent
46
         id: dialogInstallComponent
14
46
         Dialog {
47
         Dialog {
15
47
             id: dialogueInstall
48
             id: dialogueInstall
16
49
             objectName: "dialogInstall"
17
48
             title: i18n.tr("Update System")
50
             title: i18n.tr("Update System")
18
49
             text: i18n.tr("The phone needs to restart to install the system update.")
51
             text: i18n.tr("The phone needs to restart to install the system update.")
19
50
52
20
51
             Button {
53
             Button {
21
52
                 text: i18n.tr("Install & Restart")
54
                 text: i18n.tr("Install & Restart")
22
55
                 objectName: "btnInstallUpdate"
23
53
                 color: UbuntuColors.orange
56
                 color: UbuntuColors.orange
24
54
                 onClicked: {
57
                 onClicked: {
25
55
                     installingImageUpdate.visible = true;
58
                     installingImageUpdate.visible = true;
26
@@ -157,6 +160,7 @@
27
157
160
28
158
        onSystemUpdateDownloaded: {
161
        onSystemUpdateDownloaded: {
29
159
            root.updatesAvailable -= 1;
162
            root.updatesAvailable -= 1;
30
163
            root.updatesDownloaded = true;
31
160
            PopupUtils.open(dialogInstallComponent);
164
            PopupUtils.open(dialogInstallComponent);
32
161
        }
165
        }
33
162
166
34
163
167
35
=== added file 'tests/autopilot/ubuntu_system_settings/emulators.py'
36
--- tests/autopilot/ubuntu_system_settings/emulators.py	1970-01-01 00:00:00 +0000
37
+++ tests/autopilot/ubuntu_system_settings/emulators.py	2014-04-09 18:08:02 +0000
38
@@ -0,0 +1,98 @@
39
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
40
2
#
41
3
# Copyright (C) 2014 Canonical Ltd.
42
4
#
43
5
# This program is free software; you can redistribute it and/or modify
44
6
# it under the terms of the GNU Lesser General Public License as published by
45
7
# the Free Software Foundation; version 3.
46
8
#
47
9
# This program is distributed in the hope that it will be useful,
48
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
49
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
50
12
# GNU Lesser General Public License for more details.
51
13
#
52
14
# You should have received a copy of the GNU Lesser General Public License
53
15
# along with this program. If not, see <http://www.gnu.org/licenses/>.
54
16
55
17
"""Emulators for updates page used by upgrade tests."""
56
18
57
19
import time
58
20
import logging
59
21
60
22
logger = logging.getLogger(__name__)
61
23
62
24
63
25
class UpdatesPage(object):
64
26
65
27
    def __init__(self, app, pointer):
66
28
        self.app = app
67
29
        self.pointer = pointer
68
30
69
31
    def _get_updates_view(self):
70
32
        return self.app.select_single(
71
33
            'PageComponent', objectName='systemUpdatesPage'
72
34
        )
73
35
74
36
    def _get_install_dialog(self):
75
37
        return self.app.wait_select_single(
76
38
            'Dialog', objectName='dialogInstall'
77
39
        )
78
40
79
41
    def _wait_for_dialog(self):
80
42
        dialog = self._get_install_dialog()
81
43
82
44
        dialog.opacity.wait_for(1.0)
83
45
84
46
    def get_installing_update_screen(self):
85
47
        return self.app.wait_select_single(
86
48
            'QQuickRectangle', objectName='installingImageUpdate'
87
49
        )
88
50
89
51
    def wait_for_updates_to_download(self, timeout=40):
90
52
        """Wait for system updates to download
91
53
92
54
        :returns: None
93
55
        :raises: ValueError
94
56
        """
95
57
        while timeout > 0:
96
58
            download_state = self._get_updates_view().updatesDownloaded
97
59
            if download_state:
98
60
                return
99
61
100
62
            timeout = timeout - 1
101
63
            time.sleep(5)
102
64
        else:
103
65
            raise ValueError(
104
66
                "Download didn't complete in given time, check your "
105
67
                "internet and try again."
106
68
            )
107
69
108
70
    def wait_for_state(self, state, timeout=60):
109
71
        """Wait for expected state
110
72
111
73
        :returns: state
112
74
        :raises: SystemSettingsEmulatorException
113
75
        """
114
76
        for wait in range(timeout):
115
77
            status = self._get_updates_view().state
116
78
            logger.info(
117
79
                'State: {} waiting for {}'.format(status, state)
118
80
            )
119
81
            if state == status:
120
82
                return state
121
83
            time.sleep(1)
122
84
123
85
        raise ValueError(
124
86
            'Error state {} not found before timeout'.format(state)
125
87
        )
126
88
127
89
    def click_install_and_restart_button(self):
128
90
        """Wait for the install dialog to appear before clicking
129
91
        on its button.
130
92
        """
131
93
        self._wait_for_dialog()
132
94
        button = self.app.select_single(
133
95
            'Button', objectName='btnInstallUpdate'
134
96
        )
135
97
136
98
        self.pointer.click_object(button)
Status:	Work in progress
Proposed branch:	lp:~om26er/ubuntu-system-settings/upgrade_testing_prerequisite
Merge into:	lp:ubuntu-system-settings
Diff against target:	136 lines (+102/-0) 2 files modified plugins/system-update/PageComponent.qml (+4/-0) tests/autopilot/ubuntu_system_settings/emulators.py (+98/-0)
To merge this branch:	bzr merge lp:~om26er/ubuntu-system-settings/upgrade_testing_prerequisite
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Sebastien Bacher (community)		2014-04-08	Needs Fixing on 2014-07-15
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-04-09
Review via email: mp+214722@code.launchpad.net