1
=== modified file 'tests/autopilot/unity8/fixture_setup.py'
2
--- tests/autopilot/unity8/fixture_setup.py	2015-05-05 14:46:49 +0000
3
+++ tests/autopilot/unity8/fixture_setup.py	2015-05-13 11:15:59 +0000
4
@@ -17,19 +17,147 @@
5
17
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
17
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
6
18
#
18
#
7
19
19
8
20
import os
9
21
import subprocess
10
22
import threading
11
20
import fixtures
23
import fixtures
12
21
import logging
24
import logging
13
22
import os
14
23
import subprocess
15
24
25
16
25
import ubuntuuitoolkit
26
import ubuntuuitoolkit
17
26
from autopilot import introspection
27
from autopilot import introspection
18
28
from autopilot.matchers import Eventually
19
29
from testtools.matchers import Equals
20
30
from ubuntuuitoolkit import fixture_setup
21
27
31
22
28
from unity8 import (
32
from unity8 import (
23
29
    get_binary_path,
33
    get_binary_path,
24
34
    sensors,
25
30
    process_helpers
35
    process_helpers
26
31
)
36
)
27
32
37
28
38
from unity8.shell import emulators
29
39
30
40
from unity8.shell.emulators import (
31
41
    main_window as main_window_emulator
32
42
)
33
43
34
44
from unity8 import (
35
45
    get_mocks_library_path,
36
46
    get_default_extra_mock_libraries,
37
47
    get_data_dirs
38
48
)
39
49
40
50
logger = logging.getLogger(__name__)
41
51
42
52
43
53
class LaunchUnityWithFakeSensors(fixtures.Fixture):
44
54
45
55
    """Fixture to launch Unity8 with an injectable sensors backend.
46
56
47
57
    :ivar unity_proxy: The Autopilot proxy object for the Unity shell.
48
58
49
59
    """
50
60
51
61
    unity_proxy = None
52
62
    main_win = None
53
63
54
64
    def setUp(self):
55
65
        """Restart Unity8 with testability and create sensors."""
56
66
        super().setUp()
57
67
        self.useFixture(
58
68
            fixture_setup.InitctlEnvironmentVariable(
59
69
                UBUNTU_PLATFORM_API_TEST_OVERRIDE='sensors'))
60
70
61
71
        self.addCleanup(process_helpers.stop_job, 'unity8')
62
72
        restart_thread = threading.Thread(
63
73
            target=self._restart_unity_with_testability)
64
74
        restart_thread.start()
65
75
66
76
        self._create_sensors()
67
77
68
78
        restart_thread.join()
69
79
        self.fake_sensors = sensors.FakePlatformSensors()
70
80
71
81
    def _get_lightdm_mock_path(self):
72
82
        lib_path = get_mocks_library_path()
73
83
        lightdm_mock_path = os.path.abspath(
74
84
            os.path.join(lib_path, "LightDM", "liblightdm")
75
85
        )
76
86
77
87
        if not os.path.exists(lightdm_mock_path):
78
88
            raise RuntimeError(
79
89
                "LightDM mock does not exist at path {}.".
80
90
                format(lightdm_mock_path)
81
91
            )
82
92
        return lightdm_mock_path
83
93
84
94
    def _get_qml_import_path_with_mock(self):
85
95
        """Return the QML2_IMPORT_PATH value with the mock path prepended."""
86
96
        qml_import_path = [get_mocks_library_path()]
87
97
        if os.getenv('QML2_IMPORT_PATH') is not None:
88
98
            qml_import_path.append(os.getenv('QML2_IMPORT_PATH'))
89
99
90
100
        qml_import_path = ':'.join(qml_import_path)
91
101
        return qml_import_path
92
102
93
103
    def _restart_unity_with_testability(self):
94
104
        _environment = {}
95
105
96
106
        data_dirs = get_data_dirs(True)
97
107
        if data_dirs is not None:
98
108
            _environment['XDG_DATA_DIRS'] = data_dirs
99
109
100
110
        _environment['QML2_IMPORT_PATH'] = (
101
111
            self._get_qml_import_path_with_mock()
102
112
        )
103
113
104
114
        new_ld_library_path = [
105
115
            get_default_extra_mock_libraries(),
106
116
            self._get_lightdm_mock_path()
107
117
        ]
108
118
        if os.getenv('LD_LIBRARY_PATH') is not None:
109
119
            new_ld_library_path.append(os.getenv('LD_LIBRARY_PATH'))
110
120
        new_ld_library_path = ':'.join(new_ld_library_path)
111
121
        _environment['LD_LIBRARY_PATH'] = new_ld_library_path
112
122
113
123
        # FIXME: we shouldn't be doing this
114
124
        # $MIR_SOCKET, fallback to $XDG_RUNTIME_DIR/mir_socket and
115
125
        # /tmp/mir_socket as last resort
116
126
        try:
117
127
            os.unlink(
118
128
                os.getenv('MIR_SOCKET',
119
129
                          os.path.join(os.getenv('XDG_RUNTIME_DIR', "/tmp"),
120
130
                                       "mir_socket")))
121
131
        except OSError:
122
132
            pass
123
133
        try:
124
134
            os.unlink("/tmp/mir_socket")
125
135
        except OSError:
126
136
            pass
127
137
128
138
        binary_arg = "BINARY=%s" % get_binary_path()
129
139
        env_args = ["%s=%s" % (k, v) for k, v in _environment.items()]
130
140
        args = [binary_arg] + env_args
131
141
        self.unity_proxy = process_helpers.restart_unity_with_testability(
132
142
            *args)
133
143
        self.main_win = self.unity_proxy.select_single(
134
144
            main_window_emulator.QQuickView)
135
145
136
146
    def _create_sensors(self):
137
147
        # Wait for unity to start running.
138
148
        Eventually(Equals(True)).match(
139
149
            lambda: process_helpers.is_job_running('unity8'))
140
150
141
151
        # Wait for the sensors fifo file to be created.
142
152
        fifo_path = '/tmp/sensor-fifo-{0}'.format(
143
153
            process_helpers.get_unity_pid())
144
154
        Eventually(Equals(True)).match(
145
155
            lambda: os.path.exists(fifo_path))
146
156
147
157
        with open(fifo_path, 'w') as fifo:
148
158
            fifo.write('create accel 0 1000 0.1\n')
149
159
            fifo.write('create light 0 10 1\n')
150
160
            fifo.write('create proximity\n')
151
33
161
152
34
logger = logging.getLogger(__name__)
162
logger = logging.getLogger(__name__)
153
35
163
154
@@ -188,7 +316,7 @@
155
188
        self.ensure_not_running = ensure_not_running
316
        self.ensure_not_running = ensure_not_running
156
189
317
157
190
    def setUp(self):
318
    def setUp(self):
159
191
        super(LaunchMockIndicatorService, self).setUp()
319
        super().setUp()
160
192
        if self.ensure_not_running:
320
        if self.ensure_not_running:
161
193
            self.ensure_service_not_running()
321
            self.ensure_service_not_running()
162
194
        self.addCleanup(self.stop_service)
322
        self.addCleanup(self.stop_service)
163
195
323
164
=== modified file 'tests/autopilot/unity8/indicators/tests/test_display_indicator.py'
165
--- tests/autopilot/unity8/indicators/tests/test_display_indicator.py	2015-03-20 11:31:40 +0000
166
+++ tests/autopilot/unity8/indicators/tests/test_display_indicator.py	2015-05-13 11:15:59 +0000
167
@@ -18,7 +18,7 @@
168
18
18
169
19
from unity8 import (
19
from unity8 import (
170
20
    fixture_setup,
20
    fixture_setup,
172
21
    indicators,
21
    indicators
173
22
)
22
)
174
23
from unity8.indicators import tests
23
from unity8.indicators import tests
175
24
24
176
25
25
177
=== modified file 'tests/autopilot/unity8/process_helpers.py'
178
--- tests/autopilot/unity8/process_helpers.py	2015-04-28 15:20:13 +0000
179
+++ tests/autopilot/unity8/process_helpers.py	2015-05-13 11:15:59 +0000
180
@@ -58,7 +58,7 @@
181
58
    """
58
    """
182
59
    if unity_proxy_obj is None:
59
    if unity_proxy_obj is None:
183
60
        try:
60
        try:
185
61
            pid = _get_unity_pid()
61
            pid = get_unity_pid()
186
62
            unity = _get_unity_proxy_object(pid)
62
            unity = _get_unity_proxy_object(pid)
187
63
            main_window = unity.select_single(main_window_emulator.QQuickView)
63
            main_window = unity.select_single(main_window_emulator.QQuickView)
188
64
        except ProcessSearchError as e:
64
        except ProcessSearchError as e:
189
@@ -108,7 +108,7 @@
190
108
    """
108
    """
191
109
    if unity_proxy_obj is None:
109
    if unity_proxy_obj is None:
192
110
        try:
110
        try:
194
111
            pid = _get_unity_pid()
111
            pid = get_unity_pid()
195
112
            unity = _get_unity_proxy_object(pid)
112
            unity = _get_unity_proxy_object(pid)
196
113
            main_window = unity.select_single(main_window_emulator.QQuickView)
113
            main_window = unity.select_single(main_window_emulator.QQuickView)
197
114
        except ProcessSearchError as e:
114
        except ProcessSearchError as e:
198
@@ -262,7 +262,7 @@
199
262
        raise CannotAccessUnity(str(error))
262
        raise CannotAccessUnity(str(error))
200
263
263
201
264
264
203
265
def _get_unity_pid():
265
def get_unity_pid():
204
266
    try:
266
    try:
205
267
        return get_job_pid('unity8')
267
        return get_job_pid('unity8')
206
268
    except JobError as error:
268
    except JobError as error:
207
269
269
208
=== added file 'tests/autopilot/unity8/sensors.py'
209
--- tests/autopilot/unity8/sensors.py	1970-01-01 00:00:00 +0000
210
+++ tests/autopilot/unity8/sensors.py	2015-05-13 11:15:59 +0000
211
@@ -0,0 +1,93 @@
212
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
213
2
#
214
3
# Unity Autopilot Test Suite
215
4
# Copyright (C) 2015 Canonical
216
5
#
217
6
# This program is free software: you can redistribute it and/or modify
218
7
# it under the terms of the GNU General Public License as published by
219
8
# the Free Software Foundation, either version 3 of the License, or
220
9
# (at your option) any later version.
221
10
#
222
11
# This program is distributed in the hope that it will be useful,
223
12
# but WITHOUT ANY WARRANTY; without even the implied warranty of
224
13
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
225
14
# GNU General Public License for more details.
226
15
#
227
16
# You should have received a copy of the GNU General Public License
228
17
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
229
18
#
230
19
231
20
"""Control module for event injection to the fake/test platform sensors."""
232
21
233
22
from unity8 import process_helpers
234
23
235
24
236
25
class FakePlatformSensors:
237
26
238
27
    def __init__(self, pid=None):
239
28
        self.pid = pid or process_helpers.get_unity_pid()
240
29
241
30
    def set_orientation(self, action):
242
31
        if action == 'top_up':
243
32
            with open("/tmp/sensor-fifo-{0}".format(self.pid), "w") as fifo:
244
33
                fifo.write("70 accel -10.050858 -0.598550 0.756568\n")
245
34
                fifo.write("70 accel -9.797073 -0.555455 1.019930\n")
246
35
                fifo.write("70 accel -10.141838 -0.770933 0.632069\n")
247
36
                fifo.write("70 accel -12.057199 -1.259350 1.690306\n")
248
37
                fifo.write("70 accel -19.282900 -3.926491 3.098097\n")
249
38
                fifo.write("70 accel -14.480132 -14.269443 1.216254\n")
250
39
                fifo.write("70 accel 16.419436 4.242526 -7.714118\n")
251
40
                fifo.write("70 accel 5.583278 8.279149 -1.848324\n")
252
41
                fifo.write("70 accel 1.422156 8.547300 0.416591\n")
253
42
                fifo.write("70 accel 4.357447 9.988609 -0.110133\n")
254
43
                fifo.write("70 accel 0.699107 9.840169 0.756568\n")
255
44
                fifo.write("70 accel 1.364695 9.844957 -0.287304\n")
256
45
                fifo.flush()
257
46
        elif action == 'top_down':
258
47
            with open("/tmp/sensor-fifo-{0}".format(self.pid), "w") as fifo:
259
48
                fifo.write("70 accel -10.050858 -0.598550 0.756568\n")
260
49
                fifo.write("70 accel 9.538500 -0.603339 1.292869\n")
261
50
                fifo.write("70 accel 9.485827 -0.636858 1.422156\n")
262
51
                fifo.write("70 accel 9.677363 -0.402226 1.374272\n")
263
52
                fifo.write("70 accel 9.303867 -0.507571 1.283292\n")
264
53
                fifo.write("70 accel 8.604761 -1.015141 1.436521\n")
265
54
                fifo.write("70 accel 7.580042 -2.001553 0.521936\n")
266
55
                fifo.write("70 accel 7.503428 -4.247314 0.502782\n")
267
56
                fifo.write("70 accel 7.067683 -7.240066 0.842759\n")
268
57
                fifo.write("70 accel 6.488286 -9.873688 -0.541090\n")
269
58
                fifo.write("70 accel 6.229713 -9.241618 -1.048660\n")
270
59
                fifo.write("70 accel 4.046201 -9.198523 -0.057461\n")
271
60
                fifo.write("70 accel 2.398990 -9.629479 0.957681\n")
272
61
                fifo.write("70 accel 1.632846 -9.361329 -0.311246\n")
273
62
                fifo.write("70 accel -0.181959 -9.696517 -0.301669\n")
274
63
                fifo.flush()
275
64
        elif action == 'left_up':
276
65
            with open("/tmp/sensor-fifo-{0}".format(self.pid), "w") as fifo:
277
66
                fifo.write("70 accel -10.050858 -0.598550 0.756568\n")
278
67
                fifo.write("70 accel 0.196325 9.878476 0.948104\n")
279
68
                fifo.write("70 accel 0.258574 9.955091 1.091756\n")
280
69
                fifo.write("70 accel 0.287304 10.041282 1.134852\n")
281
70
                fifo.write("70 accel 1.537078 10.553641 1.561020\n")
282
71
                fifo.write("70 accel 8.130709 10.093954 2.561796\n")
283
72
                fifo.write("70 accel -0.229843 5.348647 1.723825\n")
284
73
                fifo.write("70 accel -9.916783 0.488417 -3.418920\n")
285
74
                fifo.write("70 accel -13.417107 -0.416591 -2.360683\n")
286
75
                fifo.write("70 accel -13.872005 -2.049437 -0.574608\n")
287
76
                fifo.flush()
288
77
        elif action == 'right_up':
289
78
            with open("/tmp/sensor-fifo-{0}".format(self.pid), "w") as fifo:
290
79
                fifo.write("70 accel -10.050858 -0.598550 0.756568\n")
291
80
                fifo.write("70 accel -4.550858 -0.598550 0.856568\n")
292
81
                fifo.write("70 accel -0.799663 9.988609 1.197101\n")
293
82
                fifo.write("70 accel -0.861913 9.864111 1.066701\n")
294
83
                fifo.write("70 accel -0.861913 9.864111 0.866701\n")
295
84
                fifo.write("70 accel -1.776498 9.830592 1.273715\n")
296
85
                fifo.write("70 accel -2.376498 9.830592 1.273715\n")
297
86
                fifo.write("70 accel -13.158532 2.217031 1.091756\n")
298
87
                fifo.write("70 accel 5.056554 1.067814 0.799663\n")
299
88
                fifo.write("70 accel 5.056554 1.767814 0.799663\n")
300
89
                fifo.write("70 accel 14.882358 2.896984 1.221043\n")
301
90
                fifo.write("70 accel 9.466674 -0.363919 -1.029507\n")
302
91
                fifo.write("70 accel 11.253524 -0.186748 -0.311246\n")
303
92
                fifo.write("70 accel 12.253524 -0.186748 -0.311246\n")
304
93
                fifo.flush()
305
0
94
306
=== modified file 'tests/autopilot/unity8/shell/emulators/main_window.py'
307
--- tests/autopilot/unity8/shell/emulators/main_window.py	2015-04-28 15:20:13 +0000
308
+++ tests/autopilot/unity8/shell/emulators/main_window.py	2015-05-13 11:15:59 +0000
309
@@ -169,6 +169,18 @@
310
169
            objectName='pinPadButton{}'.format(button_id)
169
            objectName='pinPadButton{}'.format(button_id)
311
170
        )
170
        )
312
171
171
313
172
    def get_shell_orientation_angle(self):
314
173
        return self._get_shell().orientationAngle
315
174
316
175
    def get_shell_orientation(self):
317
176
        return self._get_shell().orientation
318
177
319
178
    def get_shell_primary_orientation(self):
320
179
        return self._get_shell().primaryOrientation
321
180
322
181
    def get_shell_native_orientation(self):
323
182
        return self._get_shell().nativeOrientation
324
183
325
172
    @autopilot_logging.log_action(logger.info)
184
    @autopilot_logging.log_action(logger.info)
326
173
    def wait_for_notification(self):
185
    def wait_for_notification(self):
327
174
        """Wait for a notification dialog to appear.
186
        """Wait for a notification dialog to appear.
328
175
187
329
=== added file 'tests/autopilot/unity8/shell/tests/test_rotation.py'
330
--- tests/autopilot/unity8/shell/tests/test_rotation.py	1970-01-01 00:00:00 +0000
331
+++ tests/autopilot/unity8/shell/tests/test_rotation.py	2015-05-13 11:15:59 +0000
332
@@ -0,0 +1,113 @@
333
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
334
2
#
335
3
# Unity Autopilot Test Suite
336
4
# Copyright (C) 2015 Canonical
337
5
#
338
6
# This program is free software: you can redistribute it and/or modify
339
7
# it under the terms of the GNU General Public License as published by
340
8
# the Free Software Foundation, either version 3 of the License, or
341
9
# (at your option) any later version.
342
10
#
343
11
# This program is distributed in the hope that it will be useful,
344
12
# but WITHOUT ANY WARRANTY; without even the implied warranty of
345
13
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
346
14
# GNU General Public License for more details.
347
15
#
348
16
# You should have received a copy of the GNU General Public License
349
17
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
350
18
#
351
19
352
20
"""Tests for shell-rotation"""
353
21
354
22
from autopilot.platform import model
355
23
from unity8 import (
356
24
    fixture_setup,
357
25
    process_helpers
358
26
)
359
27
from unity8.shell import tests
360
28
import logging
361
29
from testtools.matchers import Equals
362
30
from autopilot.matchers import Eventually
363
31
364
32
logger = logging.getLogger(__name__)
365
33
366
34
367
35
class RotationBase(tests.UnityTestCase):
368
36
    """Base class for all shell-rotation tests that provides helper methods."""
369
37
370
38
    def setUp(self):
371
39
        if model() == 'Desktop':
372
40
            self.skipTest('Test cannot be run on the desktop.')
373
41
        super().setUp()
374
42
        self._qml_mock_enabled = False
375
43
        self._data_dirs_mock_enabled = False
376
44
377
45
    def _assert_change_of_orientation_and_angle(self):
378
46
        self.assertThat(self.shell_proxy.orientation,
379
47
                        Eventually(Equals(self.orientation)))
380
48
        self.assertThat(self.shell_proxy.orientationAngle,
381
49
                        Eventually(Equals(self.angle)))
382
50
383
51
384
52
class TestFakeSensor(RotationBase):
385
53
    scenarios = [('top up', {'action': 'top_up', 'orientation': 1}),
386
54
                 ('right up', {'action': 'right_up', 'orientation': 8}),
387
55
                 ('top down', {'action': 'top_down', 'orientation': 4}),
388
56
                 ('left up', {'action': 'left_up', 'orientation': 2})]
389
57
390
58
    def test_fake_sensor(self):
391
59
        unity_with_sensors = fixture_setup.LaunchUnityWithFakeSensors()
392
60
        self.useFixture(unity_with_sensors)
393
61
        process_helpers.unlock_unity(unity_with_sensors.unity_proxy)
394
62
        fake_sensors = unity_with_sensors.fake_sensors
395
63
        o_proxy = unity_with_sensors.main_win.select_single('OrientedShell')
396
64
397
65
        fake_sensors.set_orientation(self.action)
398
66
        self.assertThat(o_proxy.physicalOrientation,
399
67
                        Eventually(Equals(self.orientation), timeout=15))
400
68
401
69
402
70
class TestRotationWithApp(RotationBase):
403
71
    scenarios = [
404
72
        ('top up, angle 0',
405
73
            {'action': 'top_up', 'orientation': 1, 'angle': 0}),
406
74
        ('right up, angle 90',
407
75
            {'action': 'right_up', 'orientation': 8, 'angle': 90}),
408
76
        ('top down, angle 180',
409
77
            {'action': 'top_down', 'orientation': 4, 'angle': 180}),
410
78
        ('left up, angle 270',
411
79
            {'action': 'left_up', 'orientation': 2, 'angle': 270})]
412
80
413
81
    def test_rotation_with_webbrowser_app(self):
414
82
        """Do an orientation-change and verify that an app and the shell
415
83
        adapted correctly"""
416
84
417
85
        unity_with_sensors = fixture_setup.LaunchUnityWithFakeSensors()
418
86
        self.useFixture(unity_with_sensors)
419
87
        process_helpers.unlock_unity(unity_with_sensors.unity_proxy)
420
88
        fake_sensors = unity_with_sensors.fake_sensors
421
89
        o_proxy = unity_with_sensors.main_win.select_single('OrientedShell')
422
90
        self.shell_proxy = unity_with_sensors.main_win.select_single('Shell')
423
91
424
92
        # launch an application
425
93
        self.launch_upstart_application('webbrowser-app')
426
94
        unity_with_sensors.main_win.show_dash_from_launcher()
427
95
        unity_with_sensors.main_win.launch_application('webbrowser-app')
428
96
429
97
        # skip test early, if device doesn't support a certain orientation
430
98
        if not (self.shell_proxy.orientation & o_proxy.supportedOrientations):
431
99
            self.skipTest('unsupported orientation ' + self.action)
432
100
433
101
        self.assertThat(
434
102
            unity_with_sensors.main_win.get_current_focused_app_id(),
435
103
            Eventually(Equals('webbrowser-app')))
436
104
437
105
        # get default orientation and angle
438
106
        self.orientation = self.shell_proxy.orientation
439
107
        self.angle = self.shell_proxy.orientationAngle
440
108
441
109
        # check if fake sensors affect orientation and angle
442
110
        fake_sensors.set_orientation(self.action)
443
111
        self.assertThat(o_proxy.physicalOrientation,
444
112
                        Eventually(Equals(self.orientation), timeout=15))
445
113
        self._assert_change_of_orientation_and_angle()
Status:	Merged
Approved by:	Michael Zanetti on 2015-06-02
Approved revision:	1619
Merged at revision:	1805
Proposed branch:	lp:~macslow/unity8/shellRotation
Merge into:	lp:unity8
Prerequisite:	lp:~unity-team/unity8/shellRotation
Diff against target:	445 lines (+353/-7) (has conflicts) 6 files modified tests/autopilot/unity8/fixture_setup.py (+131/-3) tests/autopilot/unity8/indicators/tests/test_display_indicator.py (+1/-1) tests/autopilot/unity8/process_helpers.py (+3/-3) tests/autopilot/unity8/sensors.py (+93/-0) tests/autopilot/unity8/shell/emulators/main_window.py (+12/-0) tests/autopilot/unity8/shell/tests/test_rotation.py (+113/-0) Text conflict in debian/changelog
To merge this branch:	bzr merge lp:~macslow/unity8/shellRotation
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Michael Zanetti (community)			Approve on 2015-06-02
PS Jenkins bot (community)	continuous-integration	2015-04-16	Needs Fixing on 2015-05-13
Michał Sawicz		2015-04-16	Needs Fixing on 2015-05-06
Leo Arias (community)			Approve on 2015-04-22
Daniel d'Andrada (community)			Abstain on 2015-04-16
Review via email: mp+256493@code.launchpad.net