1
=== modified file 'debian/control'
2
--- debian/control	2014-03-03 17:03:21 +0000
3
+++ debian/control	2014-03-11 14:59:49 +0000
4
@@ -24,6 +24,8 @@
5
24
               libapt-pkg-dev,
24
               libapt-pkg-dev,
6
25
               xvfb,
25
               xvfb,
7
26
               cmake,
26
               cmake,
8
27
               pep8,
9
28
               pyflakes,
10
27
Standards-Version: 3.9.4
29
Standards-Version: 3.9.4
11
28
Homepage: https://launchpad.net/ubuntu-system-settings
30
Homepage: https://launchpad.net/ubuntu-system-settings
12
29
# If you aren't a member of ~system-settings-touch but need to upload packaging
31
# If you aren't a member of ~system-settings-touch but need to upload packaging
13
30
32
14
=== modified file 'debian/rules'
15
--- debian/rules	2014-03-03 17:03:21 +0000
16
+++ debian/rules	2014-03-11 14:59:49 +0000
17
@@ -21,3 +21,6 @@
18
21
21
19
22
%:
22
%:
20
23
	dh $@ --fail-missing --with python2,migrations
23
	dh $@ --fail-missing --with python2,migrations
21
24
22
25
override_dh_auto_test:
23
26
	python tests/test_code.py
24
24
27
25
=== modified file 'debian/ubuntu-system-settings-sound-gsettings-to-accountsservice.py' (properties changed: -x to +x)
26
--- debian/ubuntu-system-settings-sound-gsettings-to-accountsservice.py	2014-01-09 13:02:44 +0000
27
+++ debian/ubuntu-system-settings-sound-gsettings-to-accountsservice.py	2014-03-11 14:59:49 +0000
28
@@ -20,9 +20,12 @@
29
20
20
30
21
# Migrate ubuntu-system-settings sound panel settings from GSettings to
21
# Migrate ubuntu-system-settings sound panel settings from GSettings to
31
22
# AccountsService
22
# AccountsService
33
23
 
23
34
24
from __future__ import print_function
35
25
36
24
import dbus
26
import dbus
37
25
import os
27
import os
38
28
import sys
39
26
29
40
27
from gi.repository import Gio
30
from gi.repository import Gio
41
28
31
42
@@ -30,20 +33,27 @@
43
30
manager_proxy = system_bus.get_object('org.freedesktop.Accounts',
33
manager_proxy = system_bus.get_object('org.freedesktop.Accounts',
44
31
                                      '/org/freedesktop/Accounts')
34
                                      '/org/freedesktop/Accounts')
45
32
object_path = manager_proxy.FindUserById(
35
object_path = manager_proxy.FindUserById(
47
33
        os.getuid(), dbus_interface='org.freedesktop.Accounts')
36
    os.getuid(), dbus_interface='org.freedesktop.Accounts'
48
37
)
49
34
user_proxy = system_bus.get_object('org.freedesktop.Accounts', object_path)
38
user_proxy = system_bus.get_object('org.freedesktop.Accounts', object_path)
50
35
39
51
36
gsettings = Gio.Settings(schema="com.ubuntu.touch.sound")
40
gsettings = Gio.Settings(schema="com.ubuntu.touch.sound")
52
37
41
53
42
54
38
def get_string(key):
43
def get_string(key):
55
39
    return gsettings.get_string(key)
44
    return gsettings.get_string(key)
56
40
45
57
46
58
41
def get_bool(key):
47
def get_bool(key):
59
42
    return gsettings.get_boolean(key)
48
    return gsettings.get_boolean(key)
60
43
49
61
50
62
44
def set_as_setting(interface, setting, value):
51
def set_as_setting(interface, setting, value):
65
45
    user_proxy.Set(interface, setting, value, 
52
    try:
66
46
                   dbus_interface=dbus.PROPERTIES_IFACE)
53
        user_proxy.Set(interface, setting, value,
67
54
                       dbus_interface=dbus.PROPERTIES_IFACE)
68
55
    except dbus.exceptions.DBusException as e:
69
56
        print("Couldn't update %s: %s" % (setting, e), file=sys.stderr)
70
47
57
71
48
# (gsettings key, accountsservice key, function to retrieve from gsettings)
58
# (gsettings key, accountsservice key, function to retrieve from gsettings)
72
49
keys = [('silent-mode', 'SilentMode', get_bool),
59
keys = [('silent-mode', 'SilentMode', get_bool),
73
50
60
74
=== modified file 'tests/autopilot/ubuntu_system_settings/tests/__init__.py'
75
--- tests/autopilot/ubuntu_system_settings/tests/__init__.py	2014-02-18 15:42:24 +0000
76
+++ tests/autopilot/ubuntu_system_settings/tests/__init__.py	2014-03-11 14:59:49 +0000
77
@@ -13,7 +13,6 @@
78
13
13
79
14
from autopilot.input import Mouse, Touch, Pointer
14
from autopilot.input import Mouse, Touch, Pointer
80
15
from autopilot.platform import model
15
from autopilot.platform import model
81
16
from autopilot.testcase import AutopilotTestCase
82
17
from autopilot.matchers import Eventually
16
from autopilot.matchers import Eventually
83
18
from testtools.matchers import Equals, NotEquals, GreaterThan
17
from testtools.matchers import Equals, NotEquals, GreaterThan
84
19
18
85
@@ -25,12 +24,13 @@
86
25
import subprocess
24
import subprocess
87
26
from time import sleep
25
from time import sleep
88
27
26
89
27
90
28
class UbuntuSystemSettingsTestCase(UbuntuUIToolkitAppTestCase):
28
class UbuntuSystemSettingsTestCase(UbuntuUIToolkitAppTestCase):
91
29
    """ Base class for Ubuntu System Settings """
29
    """ Base class for Ubuntu System Settings """
92
30
    if model() == 'Desktop':
30
    if model() == 'Desktop':
94
31
        scenarios = [ ('with mouse', dict(input_device_class=Mouse)) ]
31
        scenarios = [('with mouse', dict(input_device_class=Mouse))]
95
32
    else:
32
    else:
97
33
        scenarios = [ ('with touch', dict(input_device_class=Touch)) ]
33
        scenarios = [('with touch', dict(input_device_class=Touch))]
98
34
34
99
35
    def setUp(self, panel=None):
35
    def setUp(self, panel=None):
100
36
        super(UbuntuSystemSettingsTestCase, self).setUp()
36
        super(UbuntuSystemSettingsTestCase, self).setUp()
101
@@ -40,7 +40,8 @@
102
40
    def launch_system_settings(self, panel=None):
40
    def launch_system_settings(self, panel=None):
103
41
        params = ['/usr/bin/system-settings']
41
        params = ['/usr/bin/system-settings']
104
42
        if (model() != 'Desktop'):
42
        if (model() != 'Desktop'):
106
43
            params.append('--desktop_file_hint=/usr/share/applications/ubuntu-system-settings.desktop')
43
            params.append('--desktop_file_hint=/usr/share/applications/'
107
44
                          'ubuntu-system-settings.desktop')
108
44
45
109
45
        # Launch to a specific panel
46
        # Launch to a specific panel
110
46
        if panel is not None:
47
        if panel is not None:
111
@@ -69,8 +70,8 @@
112
69
        page_center_x = int(page_right / 2)
70
        page_center_x = int(page_right / 2)
113
70
        page_center_y = int(page_bottom / 2)
71
        page_center_y = int(page_bottom / 2)
114
71
        while obj.globalRect[1] + obj.height > page_bottom:
72
        while obj.globalRect[1] + obj.height > page_bottom:
117
72
            self.pointer.drag(page_center_x, page_center_y, 
73
            self.pointer.drag(page_center_x, page_center_y,
118
73
                    page_center_x, page_center_y - obj.height * 2)
74
                              page_center_x, page_center_y - obj.height * 2)
119
74
            # avoid a flick
75
            # avoid a flick
120
75
            sleep(0.5)
76
            sleep(0.5)
121
76
77
122
@@ -96,7 +97,9 @@
123
96
97
124
97
    def add_mock_battery(self):
98
    def add_mock_battery(self):
125
98
        """ Make sure we have a battery """
99
        """ Make sure we have a battery """
127
99
        self.dbusmock.AddDischargingBattery('mock_BATTERY', 'Battery', 50.0, 10)
100
        self.dbusmock.AddDischargingBattery(
128
101
            'mock_BATTERY', 'Battery', 50.0, 10
129
102
        )
130
100
103
131
101
104
132
102
class UbuntuSystemSettingsBatteryTestCase(UbuntuSystemSettingsUpowerTestCase):
105
class UbuntuSystemSettingsBatteryTestCase(UbuntuSystemSettingsUpowerTestCase):
133
@@ -123,37 +126,39 @@
134
123
    def setUp(self, panel=None):
126
    def setUp(self, panel=None):
135
124
        self.obj_ofono.Reset()
127
        self.obj_ofono.Reset()
136
125
        # Add an available carrier
128
        # Add an available carrier
152
126
        self.dbusmock.AddObject('/ril_0/operator/op2',
129
        self.dbusmock.AddObject(
153
127
                'org.ofono.NetworkOperator',
130
            '/ril_0/operator/op2',
154
128
                {
131
            'org.ofono.NetworkOperator',
155
129
                    'Name': 'my.cool.telco',
132
            {
156
130
                    'Status': 'available',
133
                'Name': 'my.cool.telco',
157
131
                    'MobileCountryCode': '777',
134
                'Status': 'available',
158
132
                    'MobileNetworkCode': '22',
135
                'MobileCountryCode': '777',
159
133
                    'Technologies': ['gsm'],
136
                'MobileNetworkCode': '22',
160
134
                },
137
                'Technologies': ['gsm'],
161
135
                [
138
            },
162
136
                    ('GetProperties', '', 'a{sv}',
139
            [
163
137
                        'ret = self.GetAll("org.ofono.NetworkOperator")'),
140
                ('GetProperties', '', 'a{sv}',
164
138
                    ('Register', '', '', ''),
141
                    'ret = self.GetAll("org.ofono.NetworkOperator")'),
165
139
                ]
142
                ('Register', '', '', ''),
166
140
                )
143
            ]
167
144
        )
168
141
        # Add a forbidden carrier
145
        # Add a forbidden carrier
184
142
        self.dbusmock.AddObject('/ril_0/operator/op3',
146
        self.dbusmock.AddObject(
185
143
                'org.ofono.NetworkOperator',
147
            '/ril_0/operator/op3',
186
144
                {
148
            'org.ofono.NetworkOperator',
187
145
                    'Name': 'my.bad.telco',
149
            {
188
146
                    'Status': 'forbidden',
150
                'Name': 'my.bad.telco',
189
147
                    'MobileCountryCode': '777',
151
                'Status': 'forbidden',
190
148
                    'MobileNetworkCode': '22',
152
                'MobileCountryCode': '777',
191
149
                    'Technologies': ['gsm'],
153
                'MobileNetworkCode': '22',
192
150
                },
154
                'Technologies': ['gsm'],
193
151
                [
155
            },
194
152
                    ('GetProperties', '', 'a{sv}',
156
            [
195
153
                        'ret = self.GetAll("org.ofono.NetworkOperator")'),
157
                ('GetProperties', '', 'a{sv}',
196
154
                    ('Register', '', '', ''),
158
                    'ret = self.GetAll("org.ofono.NetworkOperator")'),
197
155
                ]
159
                ('Register', '', '', ''),
198
156
                )
160
            ]
199
161
        )
200
157
        super(UbuntuSystemSettingsOfonoTestCase, self).setUp('cellular')
162
        super(UbuntuSystemSettingsOfonoTestCase, self).setUp('cellular')
201
158
163
202
159
    @property
164
    @property
203
@@ -194,8 +199,7 @@
204
194
        """ Checks whether an space item exists and returns a value """
199
        """ Checks whether an space item exists and returns a value """
205
195
        item = self.storage_page.select_single(objectName=object_name)
200
        item = self.storage_page.select_single(objectName=object_name)
206
196
        self.assertThat(item, NotEquals(None))
201
        self.assertThat(item, NotEquals(None))
209
197
        label = item.label # Label
202
        label = item.label  # Label
208
198
        space = item.value # Disk space (bytes)
210
199
        self.assertThat(label, Equals(text))
203
        self.assertThat(label, Equals(text))
211
200
        # Get item's label
204
        # Get item's label
212
201
        size_label = item.select_single(objectName='sizeLabel')
205
        size_label = item.select_single(objectName='sizeLabel')
213
202
206
214
=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_about.py'
215
--- tests/autopilot/ubuntu_system_settings/tests/test_about.py	2014-01-27 16:17:57 +0000
216
+++ tests/autopilot/ubuntu_system_settings/tests/test_about.py	2014-03-11 14:59:49 +0000
217
@@ -8,13 +8,17 @@
218
8
from time import sleep
8
from time import sleep
219
9
9
220
10
from autopilot.platform import model
10
from autopilot.platform import model
221
11
from autopilot.matchers import Eventually
222
12
from testtools.matchers import Equals, NotEquals, GreaterThan
11
from testtools.matchers import Equals, NotEquals, GreaterThan
223
13
from unittest import expectedFailure
12
from unittest import expectedFailure
224
14
13
226
15
from ubuntu_system_settings.tests import AboutBaseTestCase, StorageBaseTestCase, LicenseBaseTestCase
14
from ubuntu_system_settings.tests import (
227
15
    AboutBaseTestCase,
228
16
    StorageBaseTestCase,
229
17
    LicenseBaseTestCase
230
18
)
231
16
from ubuntu_system_settings.utils.i18n import ugettext as _
19
from ubuntu_system_settings.utils.i18n import ugettext as _
232
17
20
233
21
234
18
class AboutTestCase(AboutBaseTestCase):
22
class AboutTestCase(AboutBaseTestCase):
235
19
    """ Tests for About this phone Page """
23
    """ Tests for About this phone Page """
236
20
24
237
@@ -96,7 +100,7 @@
238
96
    """ Tests for Storage """
100
    """ Tests for Storage """
239
97
101
240
98
    def test_storage_page(self):
102
    def test_storage_page(self):
242
99
        """ Check whether Storage page is available """ 
103
        """ Check whether Storage page is available """
243
100
        self.assertThat(self.storage_page, NotEquals(None))
104
        self.assertThat(self.storage_page, NotEquals(None))
244
101
105
245
102
    def test_disk(self):
106
    def test_disk(self):
246
@@ -136,7 +140,9 @@
247
136
140
248
137
    def test_installed_apps(self):
141
    def test_installed_apps(self):
249
138
        """ Checks whether Installed Apps list is available """
142
        """ Checks whether Installed Apps list is available """
251
139
        installed_apps_list_view = self.storage_page.select_single(objectName='installedAppsListView')
143
        installed_apps_list_view = self.storage_page.select_single(
252
144
            objectName='installedAppsListView'
253
145
        )
254
140
        self.assertThat(installed_apps_list_view, NotEquals(None))
146
        self.assertThat(installed_apps_list_view, NotEquals(None))
255
141
147
256
142
148
257
@@ -145,6 +151,5 @@
258
145
151
259
146
    @expectedFailure
152
    @expectedFailure
260
147
    def test_licenses_page(self):
153
    def test_licenses_page(self):
262
148
        """ Check whether Storage page is available """ 
154
        """ Check whether Storage page is available """
263
149
        self.assertThat(self.licenses_page, NotEquals(None))
155
        self.assertThat(self.licenses_page, NotEquals(None))
264
150
265
151
156
266
=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_cellular.py'
267
--- tests/autopilot/ubuntu_system_settings/tests/test_cellular.py	2014-02-18 12:16:22 +0000
268
+++ tests/autopilot/ubuntu_system_settings/tests/test_cellular.py	2014-03-11 14:59:49 +0000
269
@@ -5,29 +5,28 @@
270
5
# under the terms of the GNU General Public License version 3, as published
5
# under the terms of the GNU General Public License version 3, as published
271
6
# by the Free Software Foundation.
6
# by the Free Software Foundation.
272
7
7
273
8
from time import sleep
274
9
275
10
from autopilot.introspection.dbus import StateNotFoundError
8
from autopilot.introspection.dbus import StateNotFoundError
276
11
from autopilot.matchers import Eventually
277
12
from testtools.matchers import Equals, NotEquals, raises
9
from testtools.matchers import Equals, NotEquals, raises
278
13
from unittest import expectedFailure
279
14
10
280
15
from ubuntu_system_settings.tests import UbuntuSystemSettingsOfonoTestCase
11
from ubuntu_system_settings.tests import UbuntuSystemSettingsOfonoTestCase
281
16
from ubuntu_system_settings.utils.i18n import ugettext as _
12
from ubuntu_system_settings.utils.i18n import ugettext as _
282
17
13
283
18
from ubuntuuitoolkit import emulators as toolkit_emulators
14
from ubuntuuitoolkit import emulators as toolkit_emulators
284
19
15
285
16
286
20
class CellularTestCase(UbuntuSystemSettingsOfonoTestCase):
17
class CellularTestCase(UbuntuSystemSettingsOfonoTestCase):
287
21
    """ Tests for cellular Page """
18
    """ Tests for cellular Page """
288
22
19
289
23
    def navigate_to_manual(self):
20
    def navigate_to_manual(self):
290
24
        selector = self.cellular_page.select_single(
21
        selector = self.cellular_page.select_single(
293
25
                toolkit_emulators.ItemSelector,
22
            toolkit_emulators.ItemSelector,
294
26
                objectName="autoChooseCarrierSelector")
23
            objectName="autoChooseCarrierSelector"
295
24
        )
296
27
        manual = selector.select_single('Label', text=_("Manually"))
25
        manual = selector.select_single('Label', text=_("Manually"))
297
28
        self.pointer.click_object(manual)
26
        self.pointer.click_object(manual)
298
29
        choosecarrier = self.cellular_page.select_single(
27
        choosecarrier = self.cellular_page.select_single(
300
30
                objectName="chooseCarrier")
28
            objectName="chooseCarrier"
301
29
        )
302
31
        self.pointer.click_object(choosecarrier)
30
        self.pointer.click_object(choosecarrier)
303
32
        self.assertThat(self.choose_page.title, Equals(_("Carrier")))
31
        self.assertThat(self.choose_page.title, Equals(_("Carrier")))
304
33
32
305
@@ -40,8 +39,9 @@
306
40
        """ Tests whether the current network is visible and selected """
39
        """ Tests whether the current network is visible and selected """
307
41
        self.navigate_to_manual()
40
        self.navigate_to_manual()
308
42
        carriers = self.choose_page.select_single(
41
        carriers = self.choose_page.select_single(
311
43
                toolkit_emulators.ItemSelector,
42
            toolkit_emulators.ItemSelector,
312
44
                objectName="carrierSelector")
43
            objectName="carrierSelector"
313
44
        )
314
45
        # TODO: Once there is a proper ItemSelector emulator, get the items
45
        # TODO: Once there is a proper ItemSelector emulator, get the items
315
46
        # from it and check 'fake.tel' is the selected one.
46
        # from it and check 'fake.tel' is the selected one.
316
47
        manual = carriers.select_single('Label', text="fake.tel")
47
        manual = carriers.select_single('Label', text="fake.tel")
317
@@ -52,8 +52,9 @@
318
52
        """ Tests whether an alternative available network is displayed """
52
        """ Tests whether an alternative available network is displayed """
319
53
        self.navigate_to_manual()
53
        self.navigate_to_manual()
320
54
        carriers = self.choose_page.select_single(
54
        carriers = self.choose_page.select_single(
323
55
                toolkit_emulators.ItemSelector,
55
            toolkit_emulators.ItemSelector,
324
56
                objectName="carrierSelector")
56
            objectName="carrierSelector"
325
57
        )
326
57
        manual = carriers.select_single('Label', text="my.cool.telco")
58
        manual = carriers.select_single('Label', text="my.cool.telco")
327
58
        self.assertThat(manual, NotEquals(None))
59
        self.assertThat(manual, NotEquals(None))
328
59
60
329
@@ -61,7 +62,10 @@
330
61
        """ Ensures that a forbidden network is not shown """
62
        """ Ensures that a forbidden network is not shown """
331
62
        self.navigate_to_manual()
63
        self.navigate_to_manual()
332
63
        carriers = self.choose_page.select_single(
64
        carriers = self.choose_page.select_single(
337
64
                toolkit_emulators.ItemSelector,
65
            toolkit_emulators.ItemSelector,
338
65
                objectName="carrierSelector")
66
            objectName="carrierSelector"
339
66
        self.assertThat(lambda: carriers.select_single('Label', text="my.bad.telco"),
67
        )
340
67
            raises(StateNotFoundError))
68
        self.assertThat(
341
69
            lambda: carriers.select_single('Label', text="my.bad.telco"),
342
70
            raises(StateNotFoundError)
343
71
        )
344
68
72
345
=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_datetime.py'
346
--- tests/autopilot/ubuntu_system_settings/tests/test_datetime.py	2014-01-30 16:42:51 +0000
347
+++ tests/autopilot/ubuntu_system_settings/tests/test_datetime.py	2014-03-11 14:59:49 +0000
348
@@ -5,12 +5,10 @@
349
5
# under the terms of the GNU General Public License version 3, as published
5
# under the terms of the GNU General Public License version 3, as published
350
6
# by the Free Software Foundation.
6
# by the Free Software Foundation.
351
7
7
352
8
import dbus
353
9
import dbusmock
8
import dbusmock
354
10
import subprocess
9
import subprocess
355
11
from time import sleep
10
from time import sleep
356
12
11
357
13
from autopilot.platform import model
358
14
from autopilot.matchers import Eventually
12
from autopilot.matchers import Eventually
359
15
from testtools.matchers import Equals, NotEquals, GreaterThan
13
from testtools.matchers import Equals, NotEquals, GreaterThan
360
16
14
361
@@ -19,6 +17,7 @@
362
19
17
363
20
from ubuntuuitoolkit import emulators as toolkit_emulators
18
from ubuntuuitoolkit import emulators as toolkit_emulators
364
21
19
365
20
366
22
class TimeDateTestCase(UbuntuSystemSettingsTestCase,
21
class TimeDateTestCase(UbuntuSystemSettingsTestCase,
367
23
                       dbusmock.DBusTestCase):
22
                       dbusmock.DBusTestCase):
368
24
    """ Tests for the Time & Date Page """
23
    """ Tests for the Time & Date Page """
369
@@ -27,8 +26,9 @@
370
27
    def setUpClass(klass):
26
    def setUpClass(klass):
371
28
        klass.start_system_bus()
27
        klass.start_system_bus()
372
29
        klass.dbus_con = klass.get_dbus(True)
28
        klass.dbus_con = klass.get_dbus(True)
375
30
        (klass.p_mock,klass.obj_timedate1) = klass.spawn_server_template(
29
        (klass.p_mock, klass.obj_timedate1) = klass.spawn_server_template(
376
31
            'timedated', {}, stdout=subprocess.PIPE)
30
            'timedated', {}, stdout=subprocess.PIPE
377
31
        )
378
32
32
379
33
    def setUp(self):
33
    def setUp(self):
380
34
        """ Go to Time & Date page """
34
        """ Go to Time & Date page """
381
@@ -45,7 +45,9 @@
382
45
45
383
46
    def click_tz_search_field(self):
46
    def click_tz_search_field(self):
384
47
        self.scroll_to_and_click(self.tz_page)
47
        self.scroll_to_and_click(self.tz_page)
386
48
        text_field = self.main_view.select_single(objectName='selectTimeZoneField')
48
        text_field = self.main_view.select_single(
387
49
            objectName='selectTimeZoneField'
388
50
        )
389
49
        self.pointer.move_to_object(text_field)
51
        self.pointer.move_to_object(text_field)
390
50
52
391
51
    def test_time_date_page(self):
53
    def test_time_date_page(self):
392
@@ -56,14 +58,17 @@
393
56
    def test_tz_list_initially_empty(self):
58
    def test_tz_list_initially_empty(self):
394
57
        """ Checks that no list is displayed initially """
59
        """ Checks that no list is displayed initially """
395
58
        self.scroll_to_and_click(self.tz_page)
60
        self.scroll_to_and_click(self.tz_page)
397
59
        labelVisible = self.main_view.select_single(objectName='nothingLabel').visible
61
        labelVisible = self.main_view.select_single(
398
62
            objectName='nothingLabel').visible
399
60
        self.assertThat(labelVisible, Equals(True))
63
        self.assertThat(labelVisible, Equals(True))
400
61
64
401
62
    def test_searching_tz(self):
65
    def test_searching_tz(self):
402
63
        """ Check that searching for a valid location shows something """
66
        """ Check that searching for a valid location shows something """
403
64
        self.click_tz_search_field()
67
        self.click_tz_search_field()
404
65
        self.keyboard.type('London, United Kingdom')
68
        self.keyboard.type('London, United Kingdom')
406
66
        listview = self.main_view.select_single(objectName='locationsListView')
69
        listview = self.main_view.select_single(
407
70
            objectName='locationsListView'
408
71
        )
409
67
        self.assertThat(listview.count, GreaterThan(0))
72
        self.assertThat(listview.count, GreaterThan(0))
410
68
73
411
69
    def test_searching_tz_not_found(self):
74
    def test_searching_tz_not_found(self):
412
@@ -72,7 +77,8 @@
413
72
        self.keyboard.type('Oh no you don\'t!')
77
        self.keyboard.type('Oh no you don\'t!')
414
73
        listview = self.main_view.select_single(objectName='locationsListView')
78
        listview = self.main_view.select_single(objectName='locationsListView')
415
74
        self.assertThat(listview.count, Equals(0))
79
        self.assertThat(listview.count, Equals(0))
417
75
        labelVisible = self.main_view.select_single(objectName='nothingLabel').visible
80
        labelVisible = self.main_view.select_single(
418
81
            objectName='nothingLabel').visible
419
76
        self.assertThat(labelVisible, Equals(True))
82
        self.assertThat(labelVisible, Equals(True))
420
77
83
421
78
    def test_manual_tz_selection(self):
84
    def test_manual_tz_selection(self):
422
@@ -87,8 +93,9 @@
423
87
        self.assertThat(self.tz_page.text, Equals('Europe/London'))
93
        self.assertThat(self.tz_page.text, Equals('Europe/London'))
424
88
94
425
89
    def test_same_tz_selection(self):
95
    def test_same_tz_selection(self):
428
90
        """ Check that manually setting a timezone then setting the same one doesn't
96
        """Check that manually setting a timezone then setting the same one
429
91
            take you back to the index """
97
        doesn't take you back to the index.
430
98
        """
431
92
        self.test_manual_tz_selection()
99
        self.test_manual_tz_selection()
432
93
        self.click_tz_search_field()
100
        self.click_tz_search_field()
433
94
        # This is also in Europe/London
101
        # This is also in Europe/London
434
95
102
435
=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_plugins.py'
436
--- tests/autopilot/ubuntu_system_settings/tests/test_plugins.py	2014-01-21 17:23:50 +0000
437
+++ tests/autopilot/ubuntu_system_settings/tests/test_plugins.py	2014-03-11 14:59:49 +0000
438
@@ -5,17 +5,18 @@
439
5
# under the terms of the GNU General Public License version 3, as published
5
# under the terms of the GNU General Public License version 3, as published
440
6
# by the Free Software Foundation.
6
# by the Free Software Foundation.
441
7
7
442
8
from time import sleep
443
9
444
10
from autopilot.introspection.dbus import StateNotFoundError
8
from autopilot.introspection.dbus import StateNotFoundError
445
11
from autopilot.matchers import Eventually
9
from autopilot.matchers import Eventually
447
12
from testtools.matchers import Contains, Equals, NotEquals, GreaterThan, raises
10
from testtools.matchers import Equals, NotEquals, raises
448
13
11
452
14
from ubuntu_system_settings.tests import (UbuntuSystemSettingsTestCase,
12
from ubuntu_system_settings.tests import (
453
15
     UbuntuSystemSettingsUpowerTestCase,
13
    UbuntuSystemSettingsTestCase,
454
16
     UbuntuSystemSettingsBatteryTestCase)
14
    UbuntuSystemSettingsUpowerTestCase,
455
15
    UbuntuSystemSettingsBatteryTestCase
456
16
)
457
17
from ubuntu_system_settings.utils.i18n import ugettext as _
17
from ubuntu_system_settings.utils.i18n import ugettext as _
458
18
18
459
19
460
19
class SystemSettingsTestCases(UbuntuSystemSettingsTestCase):
20
class SystemSettingsTestCases(UbuntuSystemSettingsTestCase):
461
20
    """ Tests for Ubuntu System Settings """
21
    """ Tests for Ubuntu System Settings """
462
21
22
463
@@ -27,30 +28,40 @@
464
27
        header = self.main_view.select_single(objectName='systemSettingsPage')
28
        header = self.main_view.select_single(objectName='systemSettingsPage')
465
28
        self.assertThat(header, NotEquals(None))
29
        self.assertThat(header, NotEquals(None))
466
29
        self.assertThat(header.title, Eventually(Equals(_('System Settings'))))
30
        self.assertThat(header.title, Eventually(Equals(_('System Settings'))))
468
30
        
31
469
31
    def test_search(self):
32
    def test_search(self):
470
32
        """ Checks whether the Search box is available """
33
        """ Checks whether the Search box is available """
471
33
        search = self.main_view.select_single(objectName='searchTextField')
34
        search = self.main_view.select_single(objectName='searchTextField')
472
34
        self.assertThat(search, NotEquals(None))
35
        self.assertThat(search, NotEquals(None))
474
35
        
36
475
36
    def test_network_category(self):
37
    def test_network_category(self):
476
37
        """ Checks whether the Network category is available """
38
        """ Checks whether the Network category is available """
478
38
        category = self.main_view.select_single(objectName='categoryGrid-network')
39
        category = self.main_view.select_single(
479
40
            objectName='categoryGrid-network'
480
41
        )
481
39
        self.assertThat(category, NotEquals(None))
42
        self.assertThat(category, NotEquals(None))
484
40
        self.assertThat(category.categoryName, Eventually(Equals(_('Network'))))
43
        self.assertThat(
485
41
        
44
            category.categoryName, Eventually(Equals(_('Network')))
486
45
        )
487
46
488
42
    def test_personal_category(self):
47
    def test_personal_category(self):
489
43
        """ Checks whether the Personal category is available """
48
        """ Checks whether the Personal category is available """
491
44
        category = self.main_view.select_single(objectName='categoryGrid-personal')
49
        category = self.main_view.select_single(
492
50
            objectName='categoryGrid-personal'
493
51
        )
494
45
        self.assertThat(category, NotEquals(None))
52
        self.assertThat(category, NotEquals(None))
497
46
        self.assertThat(category.categoryName, Eventually(Equals(_('Personal'))))
53
        self.assertThat(
498
47
 
54
            category.categoryName, Eventually(Equals(_('Personal')))
499
55
        )
500
56
501
48
    def test_system_category(self):
57
    def test_system_category(self):
502
49
        """ Checks whether the System category is available """
58
        """ Checks whether the System category is available """
504
50
        category = self.main_view.select_single(objectName='categoryGrid-system')
59
        category = self.main_view.select_single(
505
60
            objectName='categoryGrid-system'
506
61
        )
507
51
        self.assertThat(category, NotEquals(None))
62
        self.assertThat(category, NotEquals(None))
508
52
        self.assertThat(category.categoryName, Eventually(Equals(_('System'))))
63
        self.assertThat(category.categoryName, Eventually(Equals(_('System'))))
510
53
 
64
511
54
    def test_wifi_plugin(self):
65
    def test_wifi_plugin(self):
512
55
        """ Checks whether the Wi-Fi plugin is available """
66
        """ Checks whether the Wi-Fi plugin is available """
513
56
        plugin = self.main_view.select_single(objectName='entryComponent-wifi')
67
        plugin = self.main_view.select_single(objectName='entryComponent-wifi')
514
@@ -58,70 +69,97 @@
515
58
69
516
59
    def test_cellular_plugin(self):
70
    def test_cellular_plugin(self):
517
60
        """ Checks whether the Cellunar plugin is available """
71
        """ Checks whether the Cellunar plugin is available """
519
61
        plugin = self.main_view.select_single(objectName='entryComponent-cellular')
72
        plugin = self.main_view.select_single(
520
73
            objectName='entryComponent-cellular'
521
74
        )
522
62
        self.assertThat(plugin, NotEquals(None))
75
        self.assertThat(plugin, NotEquals(None))
523
63
76
524
64
    def test_bluetooth_plugin(self):
77
    def test_bluetooth_plugin(self):
525
65
        """ Checks whether the Bluetooth plugin is available """
78
        """ Checks whether the Bluetooth plugin is available """
527
66
        plugin = self.main_view.select_single(objectName='entryComponent-bluetooth')
79
        plugin = self.main_view.select_single(
528
80
            objectName='entryComponent-bluetooth'
529
81
        )
530
67
        self.assertThat(plugin, NotEquals(None))
82
        self.assertThat(plugin, NotEquals(None))
531
68
83
532
69
    def test_background_plugin(self):
84
    def test_background_plugin(self):
533
70
        """ Checks whether the Background plugin is available """
85
        """ Checks whether the Background plugin is available """
535
71
        plugin = self.main_view.select_single(objectName='entryComponent-background')
86
        plugin = self.main_view.select_single(
536
87
            objectName='entryComponent-background'
537
88
        )
538
72
        self.assertThat(plugin, NotEquals(None))
89
        self.assertThat(plugin, NotEquals(None))
539
73
90
540
74
    def test_sound_plugin(self):
91
    def test_sound_plugin(self):
541
75
        """ Checks whether the Sound plugin is available """
92
        """ Checks whether the Sound plugin is available """
543
76
        plugin = self.main_view.select_single(objectName='entryComponent-sound')
93
        plugin = self.main_view.select_single(
544
94
            objectName='entryComponent-sound'
545
95
        )
546
77
        self.assertThat(plugin, NotEquals(None))
96
        self.assertThat(plugin, NotEquals(None))
547
78
97
548
79
    def test_language_plugin(self):
98
    def test_language_plugin(self):
549
80
        """ Checks whether the Language plugin is available """
99
        """ Checks whether the Language plugin is available """
551
81
        plugin = self.main_view.select_single(objectName='entryComponent-language')
100
        plugin = self.main_view.select_single(
552
101
            objectName='entryComponent-language'
553
102
        )
554
82
        self.assertThat(plugin, NotEquals(None))
103
        self.assertThat(plugin, NotEquals(None))
555
83
104
556
84
    def test_accounts_plugin(self):
105
    def test_accounts_plugin(self):
557
85
        """ Checks whether the Accounts plugin is available """
106
        """ Checks whether the Accounts plugin is available """
559
86
        plugin = self.main_view.select_single(objectName='entryComponent-online-accounts')
107
        plugin = self.main_view.select_single(
560
108
            objectName='entryComponent-online-accounts'
561
109
        )
562
87
        self.assertThat(plugin, NotEquals(None))
110
        self.assertThat(plugin, NotEquals(None))
563
88
111
564
89
    def test_timedate_plugin(self):
112
    def test_timedate_plugin(self):
565
90
        """ Checks whether the Time & Date plugin is available """
113
        """ Checks whether the Time & Date plugin is available """
567
91
        plugin = self.main_view.select_single(objectName='entryComponent-time-date')
114
        plugin = self.main_view.select_single(
568
115
            objectName='entryComponent-time-date'
569
116
        )
570
92
        self.assertThat(plugin, NotEquals(None))
117
        self.assertThat(plugin, NotEquals(None))
571
93
118
572
94
    def test_security_plugin(self):
119
    def test_security_plugin(self):
573
95
        """ Checks whether the Security plugin is available """
120
        """ Checks whether the Security plugin is available """
575
96
        plugin = self.main_view.select_single(objectName='entryComponent-security-privacy')
121
        plugin = self.main_view.select_single(
576
122
            objectName='entryComponent-security-privacy'
577
123
        )
578
97
        self.assertThat(plugin, NotEquals(None))
124
        self.assertThat(plugin, NotEquals(None))
579
98
125
580
99
    def test_updates_plugin(self):
126
    def test_updates_plugin(self):
581
100
        """ Checks whether the Updates plugin is available """
127
        """ Checks whether the Updates plugin is available """
583
101
        plugin = self.main_view.select_single(objectName='entryComponent-system-update')
128
        plugin = self.main_view.select_single(
584
129
            objectName='entryComponent-system-update'
585
130
        )
586
102
        self.assertThat(plugin, NotEquals(None))
131
        self.assertThat(plugin, NotEquals(None))
587
103
132
588
133
589
104
class SystemSettingsUpowerTestCases(UbuntuSystemSettingsUpowerTestCase):
134
class SystemSettingsUpowerTestCases(UbuntuSystemSettingsUpowerTestCase):
590
105
    def setUp(self):
135
    def setUp(self):
591
106
        super(SystemSettingsUpowerTestCases, self).setUp()
136
        super(SystemSettingsUpowerTestCases, self).setUp()
592
107
137
593
108
    def test_no_battery_plugin_without_battery(self):
138
    def test_no_battery_plugin_without_battery(self):
597
109
        """ Checks whether the Battery plugin is not available as we have no battery """
139
        """ Checks whether the Battery plugin is not available as we
598
110
        self.assertThat(lambda: self.main_view.select_single(objectName='entryComponent-battery'),
140
        have no battery.
599
111
            raises(StateNotFoundError))
141
        """
600
142
        self.assertThat(lambda: self.main_view.select_single(
601
143
            objectName='entryComponent-battery'),
602
144
            raises(StateNotFoundError)
603
145
        )
604
112
146
605
113
    def test_battery_plugin_battery_hotplugging(self):
147
    def test_battery_plugin_battery_hotplugging(self):
606
114
        """ Checks whether hotplugging a battery makes the panel visible """
148
        """ Checks whether hotplugging a battery makes the panel visible """
607
115
        self.add_mock_battery()
149
        self.add_mock_battery()
609
116
        plugin = self.main_view.select_single(objectName='entryComponent-battery')
150
        plugin = self.main_view.select_single(
610
151
            objectName='entryComponent-battery'
611
152
        )
612
117
        self.assertThat(plugin, NotEquals(None))
153
        self.assertThat(plugin, NotEquals(None))
613
118
154
614
155
615
119
class SystemSettingsBatteryTestCases(UbuntuSystemSettingsBatteryTestCase):
156
class SystemSettingsBatteryTestCases(UbuntuSystemSettingsBatteryTestCase):
616
120
    def setUp(self):
157
    def setUp(self):
617
121
        super(SystemSettingsBatteryTestCases, self).setUp()
158
        super(SystemSettingsBatteryTestCases, self).setUp()
618
122
159
619
123
    def test_battery_plugin(self):
160
    def test_battery_plugin(self):
620
124
        """ checks whether the Battery plugin is available """
161
        """ checks whether the Battery plugin is available """
622
125
        plugin = self.main_view.select_single(objectName='entryComponent-battery')
162
        plugin = self.main_view.select_single(
623
163
            objectName='entryComponent-battery'
624
164
        )
625
126
        self.assertThat(plugin, NotEquals(None))
165
        self.assertThat(plugin, NotEquals(None))
626
127
627
128
166
628
=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_search.py'
629
--- tests/autopilot/ubuntu_system_settings/tests/test_search.py	2014-01-17 10:15:31 +0000
630
+++ tests/autopilot/ubuntu_system_settings/tests/test_search.py	2014-03-11 14:59:49 +0000
631
@@ -5,12 +5,8 @@
632
5
# under the terms of the GNU General Public License version 3, as published
5
# under the terms of the GNU General Public License version 3, as published
633
6
# by the Free Software Foundation.
6
# by the Free Software Foundation.
634
7
7
635
8
from time import sleep
636
9
637
10
from autopilot.matchers import Eventually
638
11
from autopilot.introspection.dbus import StateNotFoundError
8
from autopilot.introspection.dbus import StateNotFoundError
641
12
from testtools.matchers import Contains, Equals, NotEquals, GreaterThan
9
from testtools.matchers import Equals, NotEquals
640
13
from unittest import skip
642
14
10
643
15
from ubuntu_system_settings.tests import UbuntuSystemSettingsTestCase
11
from ubuntu_system_settings.tests import UbuntuSystemSettingsTestCase
644
16
from ubuntu_system_settings.utils.i18n import ugettext as _
12
from ubuntu_system_settings.utils.i18n import ugettext as _
645
@@ -18,6 +14,7 @@
646
18
14
647
19
""" Tests for Ubuntu System Settings """
15
""" Tests for Ubuntu System Settings """
648
20
16
649
17
650
21
class SearchTestCases(UbuntuSystemSettingsTestCase):
18
class SearchTestCases(UbuntuSystemSettingsTestCase):
651
22
    """ Tests for Search """
19
    """ Tests for Search """
652
23
20
653
@@ -37,8 +34,9 @@
654
37
        sound = self.main_view.select_single(objectName='entryComponent-sound')
34
        sound = self.main_view.select_single(objectName='entryComponent-sound')
655
38
        self.assertThat(sound, NotEquals(None))
35
        self.assertThat(sound, NotEquals(None))
656
39
        try:
36
        try:
658
40
            background = self.main_view.select_single(objectName='entryComponent-background')
37
            background = self.main_view.select_single(
659
38
                objectName='entryComponent-background'
660
39
            )
661
41
        except StateNotFoundError:
40
        except StateNotFoundError:
662
42
            background = None
41
            background = None
663
43
        self.assertThat(background, Equals(None))
42
        self.assertThat(background, Equals(None))
664
44
 
665
45
43
666
=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_system_updates.py'
667
--- tests/autopilot/ubuntu_system_settings/tests/test_system_updates.py	2014-02-04 21:05:28 +0000
668
+++ tests/autopilot/ubuntu_system_settings/tests/test_system_updates.py	2014-03-11 14:59:49 +0000
669
@@ -5,15 +5,10 @@
670
5
# under the terms of the GNU General Public License version 3, as published
5
# under the terms of the GNU General Public License version 3, as published
671
6
# by the Free Software Foundation.
6
# by the Free Software Foundation.
672
7
7
673
8
from time import sleep
674
9
675
10
from autopilot.matchers import Eventually
676
11
from autopilot.introspection.dbus import StateNotFoundError
8
from autopilot.introspection.dbus import StateNotFoundError
679
12
from testtools.matchers import Contains, Equals, NotEquals, GreaterThan, raises
9
from testtools.matchers import NotEquals, raises
678
13
from unittest import skip
680
14
10
681
15
from ubuntu_system_settings.tests import SystemUpdatesBaseTestCase
11
from ubuntu_system_settings.tests import SystemUpdatesBaseTestCase
682
16
from ubuntu_system_settings.utils.i18n import ugettext as _
683
17
12
684
18
13
685
19
""" Tests for Ubuntu System Settings """
14
""" Tests for Ubuntu System Settings """
686
20
15
687
=== modified file 'tests/autopilot/ubuntu_system_settings/utils/i18n.py'
688
--- tests/autopilot/ubuntu_system_settings/utils/i18n.py	2013-12-17 17:29:03 +0000
689
+++ tests/autopilot/ubuntu_system_settings/utils/i18n.py	2014-03-11 14:59:49 +0000
690
@@ -8,15 +8,17 @@
691
8
import locale
8
import locale
692
9
import gettext
9
import gettext
693
10
10
696
11
APP_NAME='ubuntu-system-settings'
11
APP_NAME = 'ubuntu-system-settings'
697
12
LOCALE_DIR='/usr/share/locale/'
12
LOCALE_DIR = '/usr/share/locale/'
698
13
13
699
14
lc, encoding = locale.getdefaultlocale()
14
lc, encoding = locale.getdefaultlocale()
700
15
15
701
16
if not lc:
16
if not lc:
702
17
    lc = 'C'
17
    lc = 'C'
703
18
18
705
19
language = gettext.translation(APP_NAME, LOCALE_DIR, languages=[lc], fallback=True)
19
language = gettext.translation(
706
20
    APP_NAME, LOCALE_DIR, languages=[lc], fallback=True
707
21
)
708
20
22
709
21
# UTF-8
23
# UTF-8
710
22
ugettext = language.ugettext
24
ugettext = language.ugettext
711
23
25
712
=== added file 'tests/test_code.py'
713
--- tests/test_code.py	1970-01-01 00:00:00 +0000
714
+++ tests/test_code.py	2014-03-11 14:59:49 +0000
715
@@ -0,0 +1,47 @@
716
1
#!/usr/bin/python
717
2
718
3
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
719
4
# Copyright 2014 Canonical
720
5
#
721
6
# This program is free software: you can redistribute it and/or modify it
722
7
# under the terms of the GNU General Public License version 3, as published
723
8
# by the Free Software Foundation.
724
9
725
10
import subprocess
726
11
import sys
727
12
import unittest
728
13
729
14
730
15
class StaticCodeTests(unittest.TestCase):
731
16
732
17
    def _is_tool_installed(tool):
733
18
        return subprocess.call(['which', tool],
734
19
                               stdout=subprocess.PIPE)
735
20
736
21
    @unittest.skipIf(
737
22
        _is_tool_installed('pyflakes') != 0, 'pyflakes not installed'
738
23
    )
739
24
    def test_pyflakes(self):
740
25
        pyflakes = subprocess.Popen(
741
26
            ['pyflakes', '.'],
742
27
            stdout=subprocess.PIPE, universal_newlines=True
743
28
        )
744
29
        (out, err) = pyflakes.communicate()
745
30
        self.assertEqual(pyflakes.returncode, 0, out)
746
31
747
32
    @unittest.skipIf(
748
33
        _is_tool_installed('pep8') != 0, 'pep8 not installed'
749
34
    )
750
35
    def test_pep8(self):
751
36
        pep8 = subprocess.Popen(
752
37
            ['pep8', '.'],
753
38
            stdout=subprocess.PIPE, universal_newlines=True
754
39
        )
755
40
        (out, err) = pep8.communicate()
756
41
        self.assertEqual(pep8.returncode, 0, out)
757
42
758
43
759
44
if __name__ == '__main__':
760
45
    unittest.main(
761
46
        testRunner=unittest.TextTestRunner(stream=sys.stdout, verbosity=2)
762
47
    )
Status:	Superseded
Proposed branch:	lp:~om26er/ubuntu-system-settings/pep8_pyflakes_fix
Merge into:	lp:ubuntu-system-settings
Diff against target:	762 lines (+236/-121) 12 files modified debian/control (+2/-0) debian/rules (+3/-0) debian/ubuntu-system-settings-sound-gsettings-to-accountsservice.py (+14/-4) tests/autopilot/ubuntu_system_settings/tests/__init__.py (+43/-39) tests/autopilot/ubuntu_system_settings/tests/test_about.py (+11/-6) tests/autopilot/ubuntu_system_settings/tests/test_cellular.py (+19/-15) tests/autopilot/ubuntu_system_settings/tests/test_datetime.py (+17/-10) tests/autopilot/ubuntu_system_settings/tests/test_plugins.py (+69/-31) tests/autopilot/ubuntu_system_settings/tests/test_search.py (+5/-7) tests/autopilot/ubuntu_system_settings/tests/test_system_updates.py (+1/-6) tests/autopilot/ubuntu_system_settings/utils/i18n.py (+5/-3) tests/test_code.py (+47/-0)
To merge this branch:	bzr merge lp:~om26er/ubuntu-system-settings/pep8_pyflakes_fix
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Sebastien Bacher (community)		2014-02-24	Approve on 2014-03-10
PS Jenkins bot	continuous-integration		Approve on 2014-03-10
Review via email: mp+207966@code.launchpad.net