1
=== modified file 'autopilot/_fixtures.py'
2
--- autopilot/_fixtures.py	2015-07-16 03:26:31 +0000
3
+++ autopilot/_fixtures.py	2015-07-23 02:56:28 +0000
4
@@ -19,8 +19,7 @@
5
19
19
6
20
from fixtures import Fixture
20
from fixtures import Fixture
7
21
import logging
21
import logging
10
22
import subprocess
22
from gi.repository import Gio
9
23
11
24
23
12
25
logger = logging.getLogger(__name__)
24
logger = logging.getLogger(__name__)
13
26
25
14
@@ -58,52 +57,64 @@
15
58
    osk_schema = 'com.canonical.keyboard.maliit'
57
    osk_schema = 'com.canonical.keyboard.maliit'
16
59
    osk_show_key = 'stay-hidden'
58
    osk_show_key = 'stay-hidden'
17
60
59
18
61
    def __init__(self):
19
62
        super().__init__()
20
63
        self._original_value = get_gsettings_value(
21
64
            self.osk_schema,
22
65
            self.osk_show_key
23
66
        )
24
67
25
68
    def setUp(self):
60
    def setUp(self):
26
69
        super().setUp()
61
        super().setUp()
67
70
        set_gsettings_value(self.osk_schema, self.osk_show_key, 'false')
62
68
71
        self.addCleanup(
63
        try:
69
72
            set_gsettings_value,
64
            _original_value = get_bool_gsettings_value(
70
73
            self.osk_schema,
65
                self.osk_schema,
71
74
            self.osk_show_key,
66
                self.osk_show_key
72
75
            self._original_value
67
            )
73
76
        )
68
            set_bool_gsettings_value(
74
77
69
                self.osk_schema,
75
78
70
                self.osk_show_key,
76
79
def get_gsettings_value(schema, key):
71
                False
77
80
    """Return the output of gsettings get as a string or None if the call
72
            )
78
81
    fails.
73
            self.addCleanup(
79
82
74
                set_bool_gsettings_value,
80
83
    """
75
                self.osk_schema,
81
84
    command = ['/usr/bin/gsettings', 'get', schema, key]
76
                self.osk_show_key,
82
85
    try:
77
                _original_value
83
86
        output = subprocess.check_output(
78
            )
84
87
            command,
79
        except ValueError as e:
85
88
            stderr=subprocess.PIPE,
80
            logger.warning('Failed to set OSK gsetting: {}'.format(e))
86
89
            universal_newlines=True
81
87
90
        )
82
88
91
        return output.rstrip('\n')
83
def get_bool_gsettings_value(schema, key):
89
92
    except subprocess.CalledProcessError as e:
84
    """Return the boolean value for schema/key combo.
90
93
        logger.warning(
85
91
94
            'Failed to get gsettings value for {schema}/{key}: {error}'.format(
86
    :raises ValueError: If either ``schema`` or ``key`` are not valid.
92
95
                schema=schema, key=key, error=e.output
87
93
96
            )
88
    """
94
97
        )
89
    setting = _gsetting_get_setting(schema, key)
95
98
90
96
99
91
    return setting.get_boolean(key)
97
100
def set_gsettings_value(schema, key, value):
92
98
101
    command = ['/usr/bin/gsettings', 'set', schema, key, value]
93
99
102
    try:
94
def set_bool_gsettings_value(schema, key, value):
100
103
        subprocess.check_output(command, stderr=subprocess.PIPE)
95
    """Set the boolean value ``value`` for schema/key combo.
101
104
    except subprocess.CalledProcessError as e:
96
102
105
        logger.warning(
97
    :raises ValueError: If either ``schema`` or ``key`` are not valid.
103
106
            'Failed to set gsettings value {sch}/{key} to {v}: {error}'.format(
98
104
107
                sch=schema, key=key, v=value, error=e.output
99
    """
105
108
            )
100
106
109
        )
101
    setting = _gsetting_get_setting(schema, key)
107
102
108
103
    setting.set_boolean(key, value)
109
104
110
105
111
106
def _gsetting_get_setting(schema, key):
112
107
    if schema not in Gio.Settings.list_schemas():
113
108
        raise ValueError('schema {} is not installed.'.format(schema))
114
109
115
110
    setting = Gio.Settings.new(schema)
116
111
117
112
    if key not in setting.keys():
118
113
        raise ValueError(
119
114
            'key \'{key}\' is not available for schema \'{schema}\''.format(
120
115
                key=key,
121
116
                schema=schema
122
117
            )
123
118
        )
124
119
125
120
    return setting
126
110
121
127
=== modified file 'autopilot/tests/unit/test_fixtures.py'
128
--- autopilot/tests/unit/test_fixtures.py	2015-07-16 01:52:23 +0000
129
+++ autopilot/tests/unit/test_fixtures.py	2015-07-23 02:56:28 +0000
130
@@ -19,11 +19,8 @@
131
19
19
132
20
20
133
21
from testtools import TestCase
21
from testtools import TestCase
139
22
from testtools.matchers import (
22
from testtools.matchers import raises
140
23
    Not,
23
from unittest.mock import patch, Mock
136
24
    Raises,
137
25
)
138
26
from unittest.mock import patch
141
27
import autopilot._fixtures as ap_fixtures
24
import autopilot._fixtures as ap_fixtures
142
28
25
143
29
26
144
@@ -40,47 +37,51 @@
145
40
37
146
41
class GSettingsAccessTests(TestCase):
38
class GSettingsAccessTests(TestCase):
147
42
39
152
43
    def test_incorrect_schema_doesnt_raise_exception(self):
40
    def test_incorrect_schema_raises_exception(self):
153
44
        self.assertThat(
41
        self.assertThat(
154
45
            lambda: ap_fixtures.get_gsettings_value('foo', 'bar'),
42
            lambda: ap_fixtures._gsetting_get_setting('com.foo.', 'baz'),
155
46
            Not(Raises())
43
            raises(ValueError)
156
44
        )
157
45
158
46
    def test_incorrect_key_raises_exception(self):
159
47
        self.assertThat(
160
48
            lambda: ap_fixtures._gsetting_get_setting(
161
49
                'org.gnome.system.locale',
162
50
                'baz'
163
51
            ),
164
52
            raises(ValueError)
165
47
        )
53
        )
166
48
54
167
49
    def test_get_value_returns_expected_value(self):
55
    def test_get_value_returns_expected_value(self):
181
50
        with patch.object(ap_fixtures.subprocess, 'check_output') as check_out:
56
        with patch.object(ap_fixtures, '_gsetting_get_setting') as get_setting:
182
51
            check_out.return_value = 'buzz'
57
            setting = Mock()
183
52
            self.assertEqual(
58
            setting.get_boolean.return_value = True
184
53
                ap_fixtures.get_gsettings_value('foo', 'bar'),
59
            get_setting.return_value = setting
185
54
                'buzz'
60
            self.assertEqual(
186
55
            )
61
                ap_fixtures.get_bool_gsettings_value('foo', 'bar'),
187
56
62
                True
175
57
    def test_get_value_strips_newline(self):
176
58
        with patch.object(ap_fixtures.subprocess, 'check_output') as check_out:
177
59
            check_out.return_value = 'buzz\n'
178
60
            self.assertEqual(
179
61
                ap_fixtures.get_gsettings_value('foo', 'bar'),
180
62
                'buzz'
188
63
            )
63
            )
189
64
64
190
65
65
191
66
class OSKAlwaysEnabledTests(TestCase):
66
class OSKAlwaysEnabledTests(TestCase):
192
67
67
195
68
    def test_sets_stayhidden_to_false(self):
68
    @patch.object(ap_fixtures, '_gsetting_get_setting')
196
69
        with patch.object(ap_fixtures, 'set_gsettings_value') as set_gsetting:
69
    def test_sets_stayhidden_to_False(self, gs):
197
70
        with patch.object(ap_fixtures, 'set_bool_gsettings_value') as set_gs:
198
70
            with ap_fixtures.OSKAlwaysEnabled():
71
            with ap_fixtures.OSKAlwaysEnabled():
200
71
                set_gsetting.assert_called_once_with(
72
                set_gs.assert_called_once_with(
201
72
                    'com.canonical.keyboard.maliit',
73
                    'com.canonical.keyboard.maliit',
202
73
                    'stay-hidden',
74
                    'stay-hidden',
204
74
                    'false'
75
                    False
205
75
                )
76
                )
206
76
77
207
77
    def test_resets_value_to_original(self):
78
    def test_resets_value_to_original(self):
211
78
        with patch.object(ap_fixtures, 'set_gsettings_value') as set_gset:
79
        with patch.object(ap_fixtures, 'set_bool_gsettings_value') as set_gs:
212
79
            with patch.object(ap_fixtures, 'get_gsettings_value') as get_gset:
80
            with patch.object(ap_fixtures, 'get_bool_gsettings_value') as get_gs:  # NOQA
213
80
                get_gset.return_value = 'foo'
81
                get_gs.return_value = 'foo'
214
81
                with ap_fixtures.OSKAlwaysEnabled():
82
                with ap_fixtures.OSKAlwaysEnabled():
215
82
                    pass
83
                    pass
217
83
                set_gset.assert_called_with(
84
                set_gs.assert_called_with(
218
84
                    'com.canonical.keyboard.maliit',
85
                    'com.canonical.keyboard.maliit',
219
85
                    'stay-hidden',
86
                    'stay-hidden',
220
86
                    'foo'
87
                    'foo'
221
87
88
222
=== modified file 'debian/control'
223
--- debian/control	2015-07-16 03:24:34 +0000
224
+++ debian/control	2015-07-23 02:56:28 +0000
225
@@ -11,7 +11,6 @@
226
11
               gir1.2-ibus-1.0,
11
               gir1.2-ibus-1.0,
227
12
               gir1.2-ubuntu-app-launch-2 | gir1.2-upstart-app-launch-2,
12
               gir1.2-ubuntu-app-launch-2 | gir1.2-upstart-app-launch-2,
228
13
               graphviz,
13
               graphviz,
229
14
               libglib2.0-bin,
230
15
               libjs-jquery,
14
               libjs-jquery,
231
16
               libjs-underscore,
15
               libjs-underscore,
232
17
               liblttng-ust-dev,
16
               liblttng-ust-dev,
233
@@ -69,6 +68,7 @@
234
69
            python3-evdev,
68
            python3-evdev,
235
70
            python3-xlib (>=0.14+20091101-1ubuntu3),
69
            python3-xlib (>=0.14+20091101-1ubuntu3),
236
71
            recordmydesktop,
70
            recordmydesktop,
237
71
            ubuntu-keyboard-data,
238
72
Breaks: libautopilot-gtk (<< 1.4),
72
Breaks: libautopilot-gtk (<< 1.4),
239
73
        libautopilot-qt (<< 1.4),
73
        libautopilot-qt (<< 1.4),
240
74
Description: Utility to write and run integration tests easily (Python 3)
74
Description: Utility to write and run integration tests easily (Python 3)
Reviewer	Review Type	Date Requested	Status
Iain Lane (community)			Approve on 2015-07-23
PS Jenkins bot	continuous-integration		Approve on 2015-07-23
Autopilot Hackers		2015-07-23	Pending
Review via email: mp+265621@code.launchpad.net