1
=== modified file 'tests/autopilot/unity8/process_helpers.py'
2
--- tests/autopilot/unity8/process_helpers.py	2013-10-16 04:08:49 +0000
3
+++ tests/autopilot/unity8/process_helpers.py	2013-11-19 20:53:31 +0000
4
@@ -21,18 +21,25 @@
5
21
    get_proxy_object_for_existing_process,
21
    get_proxy_object_for_existing_process,
6
22
    ProcessSearchError,
22
    ProcessSearchError,
7
23
)
23
)
8
24
import logging
9
24
import subprocess
25
import subprocess
10
25
from unity8.shell.emulators import UnityEmulatorBase
26
from unity8.shell.emulators import UnityEmulatorBase
11
26
from unity8.shell.emulators.main_window import MainWindow
27
from unity8.shell.emulators.main_window import MainWindow
12
27
28
13
29
logger = logging.getLogger(__name__)
14
30
15
28
31
16
29
class CannotAccessUnity(Exception):
32
class CannotAccessUnity(Exception):
17
30
    pass
33
    pass
18
31
34
19
32
35
21
33
def unlock_unity():
36
def unlock_unity(unity_proxy_obj=None):
22
34
    """Helper function that attempts to unlock the unity greeter.
37
    """Helper function that attempts to unlock the unity greeter.
23
35
38
24
39
    If unity_proxy_object is None create a proxy object by querying for the
25
40
    running unity process.
26
41
    Otherwise re-use the passed proxy object.
27
42
28
36
    :raises RuntimeError: if the greeter attempts and fails to be unlocked.
43
    :raises RuntimeError: if the greeter attempts and fails to be unlocked.
29
37
44
30
38
    :raises RuntimeWarning: when the greeter cannot be found because it is
45
    :raises RuntimeWarning: when the greeter cannot be found because it is
31
@@ -43,30 +50,42 @@
32
43
      upstart job cannot be found at all.
50
      upstart job cannot be found at all.
33
44
51
34
45
    """
52
    """
59
46
    pid = _get_unity_pid()
53
    if unity_proxy_obj is None:
60
47
    try:
54
        try:
61
48
        unity = get_proxy_object_for_existing_process(
55
            pid = _get_unity_pid()
62
49
            pid=pid,
56
            unity = _get_unity_proxy_object(pid)
63
50
            emulator_base=UnityEmulatorBase,
57
            main_window = MainWindow(unity)
64
51
        )
58
        except ProcessSearchError as e:
65
52
        main_window = MainWindow(unity)
59
            raise CannotAccessUnity(
66
53
60
                "Cannot introspect unity, make sure that it has been started "
67
54
        greeter = main_window.get_greeter()
61
                "with testability. Perhaps use the function "
68
55
        if greeter is None:
62
                "'restart_unity_with_testability' this module provides."
69
56
            raise RuntimeWarning("Greeter appears to be already unlocked.")
63
                "(%s)"
70
57
        greeter.swipe()
64
                % str(e)
71
58
    except ProcessSearchError as e:
65
            )
72
59
        raise CannotAccessUnity(
66
    else:
73
60
            "Cannot introspect unity, make sure that it has been started "
67
        main_window = MainWindow(unity_proxy_obj)
74
61
            "with testability. Perhaps use the function "
68
75
62
            "'restart_unity_with_testability' this module provides."
69
    greeter = main_window.get_greeter()
76
63
            "(%s)"
70
    if greeter is None:
77
64
            % str(e)
71
        raise RuntimeWarning("Greeter appears to be already unlocked.")
78
65
        )
72
    greeter.swipe()
79
66
73
80
67
74
81
68
def restart_unity_with_testability():
75
def restart_unity_with_testability(*args):
82
69
    """Restarts (or just starts) unity8 with the testability driver loaded
76
    """Restarts (or starts) unity with testability enabled.
83
77
84
78
    Passes *args arguments to the launched process.
85
79
86
80
    """
87
81
    args += ("QT_LOAD_TESTABILITY=1",)
88
82
    return restart_unity(*args)
89
83
90
84
91
85
def restart_unity(*args):
92
86
    """Restarts (or starts) unity8 using the provided arguments.
93
87
94
88
    Passes *args arguments to the launched process.
95
70
89
96
71
    :raises subprocess.CalledProcessError: if unable to stop or start the
90
    :raises subprocess.CalledProcessError: if unable to stop or start the
97
72
      unity8 upstart job.
91
      unity8 upstart job.
98
@@ -75,27 +94,28 @@
99
75
    status = _get_unity_status()
94
    status = _get_unity_status()
100
76
    if "start/" in status:
95
    if "start/" in status:
101
77
        try:
96
        try:
108
78
            print("Stopping unity.")
97
            output = subprocess.check_output(['initctl', 'stop', 'unity8'])
109
79
            subprocess.check_call([
98
            logger.info(output)
104
80
                'initctl',
105
81
                'stop',
106
82
                'unity8',
107
83
            ])
110
84
        except subprocess.CalledProcessError as e:
99
        except subprocess.CalledProcessError as e:
112
85
            e.args += ("Failed to stop running instance of unity8", )
100
            e.args += (
113
101
                "Failed to stop running instance of unity8: %s" % e.output,
114
102
            )
115
86
            raise
103
            raise
116
87
104
117
88
    try:
105
    try:
125
89
        print("Starting unity with testability.")
106
        command = ['initctl', 'start', 'unity8'] + list(args)
126
90
        subprocess.check_call([
107
        output = subprocess.check_output(
127
91
            'initctl',
108
            command,
128
92
            'start',
109
            stderr=subprocess.STDOUT,
129
93
            'unity8',
110
            universal_newlines=True,
130
94
            'QT_LOAD_TESTABILITY=1',
111
        )
131
95
        ])
112
        logger.info(output)
132
113
        pid = _get_unity_pid()
133
96
    except subprocess.CalledProcessError as e:
114
    except subprocess.CalledProcessError as e:
135
97
        e.args += ("Failed to start unity8 with testability ", )
115
        e.args += ("Failed to start unity8: %s" % e.output,)
136
98
        raise
116
        raise
137
117
    else:
138
118
        return _get_unity_proxy_object(pid)
139
99
119
140
100
120
141
101
def _get_unity_status():
121
def _get_unity_status():
142
@@ -114,3 +134,10 @@
143
114
    if not "start/" in status:
134
    if not "start/" in status:
144
115
        raise CannotAccessUnity("Unity is not in the running state.")
135
        raise CannotAccessUnity("Unity is not in the running state.")
145
116
    return int(status.split()[-1])
136
    return int(status.split()[-1])
146
137
147
138
148
139
def _get_unity_proxy_object(pid):
149
140
    return get_proxy_object_for_existing_process(
150
141
        pid=pid,
151
142
        emulator_base=UnityEmulatorBase,
152
143
    )
153
117
144
154
=== modified file 'tests/autopilot/unity8/shell/tests/__init__.py'
155
--- tests/autopilot/unity8/shell/tests/__init__.py	2013-11-01 13:59:50 +0000
156
+++ tests/autopilot/unity8/shell/tests/__init__.py	2013-11-19 20:53:31 +0000
157
@@ -28,7 +28,6 @@
158
28
from autopilot.testcase import AutopilotTestCase
28
from autopilot.testcase import AutopilotTestCase
159
29
from autopilot.matchers import Eventually
29
from autopilot.matchers import Eventually
160
30
from autopilot.input import Touch
30
from autopilot.input import Touch
161
31
from autopilot.introspection import get_proxy_object_for_existing_process
162
32
from autopilot.display import Display
31
from autopilot.display import Display
163
33
import logging
32
import logging
164
34
import os.path
33
import os.path
165
@@ -43,7 +42,7 @@
166
43
    get_default_extra_mock_libraries,
42
    get_default_extra_mock_libraries,
167
44
    get_data_dirs
43
    get_data_dirs
168
45
)
44
)
170
46
from unity8.shell.emulators import UnityEmulatorBase
45
from unity8.process_helpers import restart_unity_with_testability
171
47
from unity8.shell.emulators.dash import Dash
46
from unity8.shell.emulators.dash import Dash
172
48
from unity8.shell.emulators.main_window import MainWindow
47
from unity8.shell.emulators.main_window import MainWindow
173
49
48
174
@@ -105,7 +104,7 @@
175
105
                                           ),
104
                                           ),
176
106
                                 "upstart")
105
                                 "upstart")
177
107
                    )
106
                    )
179
108
                )
107
            )
180
109
            sys.exit(1)
108
            sys.exit(1)
181
110
109
182
111
        if "start/" in output:
110
        if "start/" in output:
183
@@ -303,32 +302,20 @@
184
303
302
185
304
        binary_arg = "BINARY=%s" % binary_path
303
        binary_arg = "BINARY=%s" % binary_path
186
305
        extra_args = "ARGS=%s" % " ".join(args)
304
        extra_args = "ARGS=%s" % " ".join(args)
198
306
305
        env_args = ["%s=%s" % (k, v) for k, v in self._environment.iteritems()]
199
307
        output = subprocess.check_output(
306
        all_args = [binary_arg, extra_args] + env_args
189
308
            [
190
309
                "/sbin/initctl",
191
310
                "start",
192
311
                "unity8",
193
312
                binary_arg,
194
313
                extra_args,
195
314
            ] + ["%s=%s" % (k, v) for k, v in self._environment.iteritems()],
196
315
            stderr=subprocess.STDOUT,
197
316
        )
200
317
307
201
318
        self.addCleanup(self._cleanup_launching_upstart_unity)
308
        self.addCleanup(self._cleanup_launching_upstart_unity)
202
319
309
209
320
        pid = int(output.split()[-1])
310
        return restart_unity_with_testability(*all_args)
204
321
205
322
        return get_proxy_object_for_existing_process(
206
323
            pid=pid,
207
324
            emulator_base=UnityEmulatorBase,
208
325
        )
210
326
311
211
327
    def _cleanup_launching_upstart_unity(self):
312
    def _cleanup_launching_upstart_unity(self):
212
328
        logger.info("Stopping unity")
313
        logger.info("Stopping unity")
213
329
        try:
314
        try:
214
330
            subprocess.check_output(
315
            subprocess.check_output(
216
331
                ["/sbin/initctl", "stop", "unity8"], stderr=subprocess.STDOUT)
316
                ["/sbin/initctl", "stop", "unity8"],
217
317
                stderr=subprocess.STDOUT
218
318
            )
219
332
        except subprocess.CalledProcessError:
319
        except subprocess.CalledProcessError:
220
333
            logger.warning("Appears unity was already stopped!")
320
            logger.warning("Appears unity was already stopped!")
221
334
321
222
335
322
223
=== modified file 'tests/autopilot/unity8/shell/tests/test_hud.py'
224
--- tests/autopilot/unity8/shell/tests/test_hud.py	2013-10-02 09:24:10 +0000
225
+++ tests/autopilot/unity8/shell/tests/test_hud.py	2013-11-19 20:53:31 +0000
226
@@ -19,6 +19,7 @@
227
19
19
228
20
from __future__ import absolute_import
20
from __future__ import absolute_import
229
21
21
230
22
from unity8.process_helpers import unlock_unity
231
22
from unity8.shell import with_lightdm_mock, DragMixin
23
from unity8.shell import with_lightdm_mock, DragMixin
232
23
from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios
24
from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios
233
24
25
234
@@ -38,8 +39,8 @@
235
38
           The button must disappear when touching somewhere on the screen except the button itself.
39
           The button must disappear when touching somewhere on the screen except the button itself.
236
39
40
237
40
        """
41
        """
240
41
        self.launch_unity()
42
        unity_proxy = self.launch_unity()
241
42
        self.main_window.get_greeter().swipe()
43
        unlock_unity(unity_proxy)
242
43
        window = self.main_window.get_qml_view()
44
        window = self.main_window.get_qml_view()
243
44
        hud_show_button = self.main_window.get_hud_show_button()
45
        hud_show_button = self.main_window.get_hud_show_button()
244
45
        edge_drag_area = self.main_window.get_hud_edge_drag_area()
46
        edge_drag_area = self.main_window.get_hud_edge_drag_area()
245
@@ -80,8 +81,8 @@
246
80
           Test that the hud button stays on screen and tapping it opens the hud.
81
           Test that the hud button stays on screen and tapping it opens the hud.
247
81
82
248
82
        """
83
        """
251
83
        self.launch_unity()
84
        unity_proxy = self.launch_unity()
252
84
        self.main_window.get_greeter().swipe()
85
        unlock_unity(unity_proxy)
253
85
        window = self.main_window.get_qml_view()
86
        window = self.main_window.get_qml_view()
254
86
        hud_show_button = self.main_window.get_hud_show_button()
87
        hud_show_button = self.main_window.get_hud_show_button()
255
87
        hud = self.main_window.get_hud()
88
        hud = self.main_window.get_hud()
256
@@ -117,8 +118,8 @@
257
117
118
258
118
    def test_hide_hud_click(self):
119
    def test_hide_hud_click(self):
259
119
        """Tapping the close button of the Hud must dismiss it."""
120
        """Tapping the close button of the Hud must dismiss it."""
262
120
        self.launch_unity()
121
        unity_proxy = self.launch_unity()
263
121
        self.main_window.get_greeter().swipe()
122
        unlock_unity(unity_proxy)
264
122
        hud = self.main_window.get_hud()
123
        hud = self.main_window.get_hud()
265
123
124
266
124
        self._launch_test_app_from_app_screen()
125
        self._launch_test_app_from_app_screen()
267
@@ -134,8 +135,8 @@
268
134
        released downward.
135
        released downward.
269
135
136
270
136
        """
137
        """
273
137
        self.launch_unity()
138
        unity_proxy = self.launch_unity()
274
138
        self.main_window.get_greeter().swipe()
139
        unlock_unity(unity_proxy)
275
139
        window = self.main_window.get_qml_view()
140
        window = self.main_window.get_qml_view()
276
140
        hud = self.main_window.get_hud()
141
        hud = self.main_window.get_hud()
277
141
142
278
@@ -152,8 +153,8 @@
279
152
153
280
153
    def test_launcher_hides_hud(self):
154
    def test_launcher_hides_hud(self):
281
154
        """Opening the Launcher while the Hud is active must close the Hud."""
155
        """Opening the Launcher while the Hud is active must close the Hud."""
284
155
        self.launch_unity()
156
        unity_proxy = self.launch_unity()
285
156
        self.main_window.get_greeter().swipe()
157
        unlock_unity(unity_proxy)
286
157
        hud = self.main_window.get_hud()
158
        hud = self.main_window.get_hud()
287
158
        launcher = self.main_window.get_launcher()
159
        launcher = self.main_window.get_launcher()
288
159
160
289
160
161
290
=== modified file 'tests/autopilot/unity8/shell/tests/test_notifications.py'
291
--- tests/autopilot/unity8/shell/tests/test_notifications.py	2013-11-01 13:59:50 +0000
292
+++ tests/autopilot/unity8/shell/tests/test_notifications.py	2013-11-19 20:53:31 +0000
293
@@ -21,6 +21,7 @@
294
21
21
295
22
from __future__ import absolute_import
22
from __future__ import absolute_import
296
23
23
297
24
from unity8.process_helpers import unlock_unity
298
24
from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios
25
from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios
299
25
26
300
26
from testtools.matchers import Equals, NotEquals
27
from testtools.matchers import Equals, NotEquals
301
@@ -118,9 +119,8 @@
302
118
119
303
119
    def test_interactive(self):
120
    def test_interactive(self):
304
120
        """Interactive notification must react upon click on itself."""
121
        """Interactive notification must react upon click on itself."""
308
121
        self.launch_unity()
122
        unity_proxy = self.launch_unity()
309
122
        greeter = self.main_window.get_greeter()
123
        unlock_unity(unity_proxy)
307
123
        greeter.swipe()
310
124
124
311
125
        notify_list = self._get_notifications_list()
125
        notify_list = self._get_notifications_list()
312
126
126
313
@@ -158,9 +158,8 @@
314
158
    def test_sd_incoming_call(self):
158
    def test_sd_incoming_call(self):
315
159
        """Rejecting a call should make notification expand and
159
        """Rejecting a call should make notification expand and
316
160
            offer more options."""
160
            offer more options."""
320
161
        self.launch_unity()
161
        unity_proxy = self.launch_unity()
321
162
        greeter = self.main_window.get_greeter()
162
        unlock_unity(unity_proxy)
319
163
        greeter.swipe()
322
164
163
323
165
        notify_list = self._get_notifications_list()
164
        notify_list = self._get_notifications_list()
324
166
165
325
@@ -336,9 +335,8 @@
326
336
335
327
337
    def test_icon_summary_body(self):
336
    def test_icon_summary_body(self):
328
338
        """Notification must display the expected summary and body text."""
337
        """Notification must display the expected summary and body text."""
332
339
        self.launch_unity()
338
        unity_proxy = self.launch_unity()
333
340
        greeter = self.main_window.get_greeter()
339
        unlock_unity(unity_proxy)
331
341
        greeter.swipe()
334
342
340
335
343
        notify_list = self._get_notifications_list()
341
        notify_list = self._get_notifications_list()
336
344
342
337
@@ -377,9 +375,8 @@
338
377
    def test_icon_summary(self):
375
    def test_icon_summary(self):
339
378
        """Notification must display the expected summary and secondary
376
        """Notification must display the expected summary and secondary
340
379
        icon."""
377
        icon."""
344
380
        self.launch_unity()
378
        unity_proxy = self.launch_unity()
345
381
        greeter = self.main_window.get_greeter()
379
        unlock_unity(unity_proxy)
343
382
        greeter.swipe()
346
383
380
347
384
        notify_list = self._get_notifications_list()
381
        notify_list = self._get_notifications_list()
348
385
382
349
@@ -416,9 +413,8 @@
350
416
    def test_urgency_order(self):
413
    def test_urgency_order(self):
351
417
        """Notifications must be displayed in order according to their
414
        """Notifications must be displayed in order according to their
352
418
        urgency."""
415
        urgency."""
356
419
        self.launch_unity()
416
        unity_proxy = self.launch_unity()
357
420
        greeter = self.main_window.get_greeter()
417
        unlock_unity(unity_proxy)
355
421
        greeter.swipe()
358
422
418
359
423
        notify_list = self._get_notifications_list()
419
        notify_list = self._get_notifications_list()
360
424
420
361
@@ -504,9 +500,8 @@
362
504
500
363
505
    def test_summary_and_body(self):
501
    def test_summary_and_body(self):
364
506
        """Notification must display the expected summary- and body-text."""
502
        """Notification must display the expected summary- and body-text."""
368
507
        self.launch_unity()
503
        unity_proxy = self.launch_unity()
369
508
        greeter = self.main_window.get_greeter()
504
        unlock_unity(unity_proxy)
367
509
        greeter.swipe()
370
510
505
371
511
        notify_list = self._get_notifications_list()
506
        notify_list = self._get_notifications_list()
372
512
507
373
@@ -518,6 +513,7 @@
374
518
513
375
519
        notification = notify_list.wait_select_single(
514
        notification = notify_list.wait_select_single(
376
520
            'Notification', objectName='notification1')
515
            'Notification', objectName='notification1')
377
516
378
521
        self._assert_notification(
517
        self._assert_notification(
379
522
            notification,
518
            notification,
380
523
            summary,
519
            summary,
381
@@ -529,9 +525,8 @@
382
529
525
383
530
    def test_summary_only(self):
526
    def test_summary_only(self):
384
531
        """Notification must display only the expected summary-text."""
527
        """Notification must display only the expected summary-text."""
388
532
        self.launch_unity()
528
        unity_proxy = self.launch_unity()
389
533
        greeter = self.main_window.get_greeter()
529
        unlock_unity(unity_proxy)
387
534
        greeter.swipe()
390
535
530
391
536
        notify_list = self._get_notifications_list()
531
        notify_list = self._get_notifications_list()
392
537
532
393
@@ -548,9 +543,8 @@
394
548
    def test_update_notification_same_layout(self):
543
    def test_update_notification_same_layout(self):
395
549
        """Notification must allow updating its contents while being
544
        """Notification must allow updating its contents while being
396
550
        displayed."""
545
        displayed."""
400
551
        self.launch_unity()
546
        unity_proxy = self.launch_unity()
401
552
        greeter = self.main_window.get_greeter()
547
        unlock_unity(unity_proxy)
399
553
        greeter.swipe()
402
554
548
403
555
        notify_list = self._get_notifications_list()
549
        notify_list = self._get_notifications_list()
404
556
550
405
@@ -587,9 +581,8 @@
406
587
    def test_update_notification_layout_change(self):
581
    def test_update_notification_layout_change(self):
407
588
        """Notification must allow updating its contents and layout while
582
        """Notification must allow updating its contents and layout while
408
589
        being displayed."""
583
        being displayed."""
412
590
        self.launch_unity()
584
        unity_proxy = self.launch_unity()
413
591
        greeter = self.main_window.get_greeter()
585
        unlock_unity(unity_proxy)
411
592
        greeter.swipe()
414
593
586
415
594
        notify_list = self._get_notifications_list()
587
        notify_list = self._get_notifications_list()
416
595
588
417
@@ -612,6 +605,7 @@
418
612
605
419
613
        get_notification = lambda: notify_list.wait_select_single(
606
        get_notification = lambda: notify_list.wait_select_single(
420
614
            'Notification', objectName='notification1')
607
            'Notification', objectName='notification1')
421
608
422
615
        self._assert_notification(
609
        self._assert_notification(
423
616
            get_notification(),
610
            get_notification(),
424
617
            summary,
611
            summary,
425
@@ -633,9 +627,8 @@
426
633
627
427
634
    def test_append_hint(self):
628
    def test_append_hint(self):
428
635
        """Notification has to accumulate body-text using append-hint."""
629
        """Notification has to accumulate body-text using append-hint."""
432
636
        self.launch_unity()
630
        unity_proxy = self.launch_unity()
433
637
        greeter = self.main_window.get_greeter()
631
        unlock_unity(unity_proxy)
431
638
        greeter.swipe()
434
639
632
435
640
        notify_list = self._get_notifications_list()
633
        notify_list = self._get_notifications_list()
436
641
634
437
@@ -654,6 +647,7 @@
438
654
647
439
655
        get_notification = lambda: notify_list.wait_select_single(
648
        get_notification = lambda: notify_list.wait_select_single(
440
656
            'Notification', objectName='notification1')
649
            'Notification', objectName='notification1')
441
650
442
657
        notification = get_notification()
651
        notification = get_notification()
443
658
        self._assert_notification(
652
        self._assert_notification(
444
659
            notification,
653
            notification,
445
@@ -685,6 +679,7 @@
446
685
                hints=[('x-canonical-append', 'true')]
679
                hints=[('x-canonical-append', 'true')]
447
686
            )
680
            )
448
687
            notification.show()
681
            notification.show()
449
682
450
688
            get_notification = lambda: notify_list.wait_select_single(
683
            get_notification = lambda: notify_list.wait_select_single(
451
689
                'Notification',
684
                'Notification',
452
690
                objectName='notification1'
685
                objectName='notification1'
Status:	Merged
Approved by:	Michał Sawicz on 2013-11-19
Approved revision:	481
Merged at revision:	541
Proposed branch:	lp:~veebers/unity8/ap_make_use_of_helpers_in_tests
Merge into:	lp:unity8
Prerequisite:	lp:~veebers/unity8/adding_unlock_emulator
Diff against target:	452 lines (+111/-101) 4 files modified tests/autopilot/unity8/process_helpers.py (+67/-40) tests/autopilot/unity8/shell/tests/__init__.py (+8/-21) tests/autopilot/unity8/shell/tests/test_hud.py (+11/-10) tests/autopilot/unity8/shell/tests/test_notifications.py (+25/-30)
To merge this branch:	bzr merge lp:~veebers/unity8/ap_make_use_of_helpers_in_tests
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-11-20
Michał Sawicz		2013-10-17	Approve on 2013-11-19
Review via email: mp+191575@code.launchpad.net
1	=== modified file 'tests/autopilot/unity8/process_helpers.py'
2	--- tests/autopilot/unity8/process_helpers.py 2013-10-16 04:08:49 +0000
3	+++ tests/autopilot/unity8/process_helpers.py 2013-11-19 20:53:31 +0000
4	@@ -21,18 +21,25 @@
5	21	get_proxy_object_for_existing_process,	21	get_proxy_object_for_existing_process,
6	22	ProcessSearchError,	22	ProcessSearchError,
7	23	)	23	)
8			24	import logging
9	24	import subprocess	25	import subprocess
10	25	from unity8.shell.emulators import UnityEmulatorBase	26	from unity8.shell.emulators import UnityEmulatorBase
11	26	from unity8.shell.emulators.main_window import MainWindow	27	from unity8.shell.emulators.main_window import MainWindow
12	27		28
13			29	logger = logging.getLogger(__name__)
14			30
15	28		31
16	29	class CannotAccessUnity(Exception):	32	class CannotAccessUnity(Exception):
17	30	pass	33	pass
18	31		34
19	32		35
21	33	def unlock_unity():	36	def unlock_unity(unity_proxy_obj=None):
22	34	"""Helper function that attempts to unlock the unity greeter.	37	"""Helper function that attempts to unlock the unity greeter.
23	35		38
24			39	If unity_proxy_object is None create a proxy object by querying for the
25			40	running unity process.
26			41	Otherwise re-use the passed proxy object.
27			42
28	36	:raises RuntimeError: if the greeter attempts and fails to be unlocked.	43	:raises RuntimeError: if the greeter attempts and fails to be unlocked.
29	37		44
30	38	:raises RuntimeWarning: when the greeter cannot be found because it is	45	:raises RuntimeWarning: when the greeter cannot be found because it is
31	@@ -43,30 +50,42 @@
32	43	upstart job cannot be found at all.	50	upstart job cannot be found at all.
33	44		51
34	45	"""	52	"""
59	46	pid = _get_unity_pid()	53	if unity_proxy_obj is None:
60	47	try:	54	try:
61	48	unity = get_proxy_object_for_existing_process(	55	pid = _get_unity_pid()
62	49	pid=pid,	56	unity = _get_unity_proxy_object(pid)
63	50	emulator_base=UnityEmulatorBase,	57	main_window = MainWindow(unity)
64	51	)	58	except ProcessSearchError as e:
65	52	main_window = MainWindow(unity)	59	raise CannotAccessUnity(
66	53		60	"Cannot introspect unity, make sure that it has been started "
67	54	greeter = main_window.get_greeter()	61	"with testability. Perhaps use the function "
68	55	if greeter is None:	62	"'restart_unity_with_testability' this module provides."
69	56	raise RuntimeWarning("Greeter appears to be already unlocked.")	63	"(%s)"
70	57	greeter.swipe()	64	% str(e)
71	58	except ProcessSearchError as e:	65	)
72	59	raise CannotAccessUnity(	66	else:
73	60	"Cannot introspect unity, make sure that it has been started "	67	main_window = MainWindow(unity_proxy_obj)
74	61	"with testability. Perhaps use the function "	68
75	62	"'restart_unity_with_testability' this module provides."	69	greeter = main_window.get_greeter()
76	63	"(%s)"	70	if greeter is None:
77	64	% str(e)	71	raise RuntimeWarning("Greeter appears to be already unlocked.")
78	65	)	72	greeter.swipe()
79	66		73
80	67		74
81	68	def restart_unity_with_testability():	75	def restart_unity_with_testability(*args):
82	69	"""Restarts (or just starts) unity8 with the testability driver loaded	76	"""Restarts (or starts) unity with testability enabled.
83			77
84			78	Passes *args arguments to the launched process.
85			79
86			80	"""
87			81	args += ("QT_LOAD_TESTABILITY=1",)
88			82	return restart_unity(*args)
89			83
90			84
91			85	def restart_unity(*args):
92			86	"""Restarts (or starts) unity8 using the provided arguments.
93			87
94			88	Passes *args arguments to the launched process.
95	70		89
96	71	:raises subprocess.CalledProcessError: if unable to stop or start the	90	:raises subprocess.CalledProcessError: if unable to stop or start the
97	72	unity8 upstart job.	91	unity8 upstart job.
98	@@ -75,27 +94,28 @@
99	75	status = _get_unity_status()	94	status = _get_unity_status()
100	76	if "start/" in status:	95	if "start/" in status:
101	77	try:	96	try:
108	78	print("Stopping unity.")	97	output = subprocess.check_output(['initctl', 'stop', 'unity8'])
109	79	subprocess.check_call([	98	logger.info(output)
104	80	'initctl',
105	81	'stop',
106	82	'unity8',
107	83	])
110	84	except subprocess.CalledProcessError as e:	99	except subprocess.CalledProcessError as e:
112	85	e.args += ("Failed to stop running instance of unity8", )	100	e.args += (
113			101	"Failed to stop running instance of unity8: %s" % e.output,
114			102	)
115	86	raise	103	raise
116	87		104
117	88	try:	105	try:
125	89	print("Starting unity with testability.")	106	command = ['initctl', 'start', 'unity8'] + list(args)
126	90	subprocess.check_call([	107	output = subprocess.check_output(
127	91	'initctl',	108	command,
128	92	'start',	109	stderr=subprocess.STDOUT,
129	93	'unity8',	110	universal_newlines=True,
130	94	'QT_LOAD_TESTABILITY=1',	111	)
131	95	])	112	logger.info(output)
132			113	pid = _get_unity_pid()
133	96	except subprocess.CalledProcessError as e:	114	except subprocess.CalledProcessError as e:
135	97	e.args += ("Failed to start unity8 with testability ", )	115	e.args += ("Failed to start unity8: %s" % e.output,)
136	98	raise	116	raise
137			117	else:
138			118	return _get_unity_proxy_object(pid)
139	99		119
140	100		120
141	101	def _get_unity_status():	121	def _get_unity_status():
142	@@ -114,3 +134,10 @@
143	114	if not "start/" in status:	134	if not "start/" in status:
144	115	raise CannotAccessUnity("Unity is not in the running state.")	135	raise CannotAccessUnity("Unity is not in the running state.")
145	116	return int(status.split()[-1])	136	return int(status.split()[-1])
146			137
147			138
148			139	def _get_unity_proxy_object(pid):
149			140	return get_proxy_object_for_existing_process(
150			141	pid=pid,
151			142	emulator_base=UnityEmulatorBase,
152			143	)
153	117		144
154	=== modified file 'tests/autopilot/unity8/shell/tests/__init__.py'
155	--- tests/autopilot/unity8/shell/tests/__init__.py 2013-11-01 13:59:50 +0000
156	+++ tests/autopilot/unity8/shell/tests/__init__.py 2013-11-19 20:53:31 +0000
157	@@ -28,7 +28,6 @@
158	28	from autopilot.testcase import AutopilotTestCase	28	from autopilot.testcase import AutopilotTestCase
159	29	from autopilot.matchers import Eventually	29	from autopilot.matchers import Eventually
160	30	from autopilot.input import Touch	30	from autopilot.input import Touch
161	31	from autopilot.introspection import get_proxy_object_for_existing_process
162	32	from autopilot.display import Display	31	from autopilot.display import Display
163	33	import logging	32	import logging
164	34	import os.path	33	import os.path
165	@@ -43,7 +42,7 @@
166	43	get_default_extra_mock_libraries,	42	get_default_extra_mock_libraries,
167	44	get_data_dirs	43	get_data_dirs
168	45	)	44	)
170	46	from unity8.shell.emulators import UnityEmulatorBase	45	from unity8.process_helpers import restart_unity_with_testability
171	47	from unity8.shell.emulators.dash import Dash	46	from unity8.shell.emulators.dash import Dash
172	48	from unity8.shell.emulators.main_window import MainWindow	47	from unity8.shell.emulators.main_window import MainWindow
173	49		48
174	@@ -105,7 +104,7 @@
175	105	),	104	),
176	106	"upstart")	105	"upstart")
177	107	)	106	)
179	108	)	107	)
180	109	sys.exit(1)	108	sys.exit(1)
181	110		109
182	111	if "start/" in output:	110	if "start/" in output:
183	@@ -303,32 +302,20 @@
184	303		302
185	304	binary_arg = "BINARY=%s" % binary_path	303	binary_arg = "BINARY=%s" % binary_path
186	305	extra_args = "ARGS=%s" % " ".join(args)	304	extra_args = "ARGS=%s" % " ".join(args)
198	306		305	env_args = ["%s=%s" % (k, v) for k, v in self._environment.iteritems()]
199	307	output = subprocess.check_output(	306	all_args = [binary_arg, extra_args] + env_args
189	308	[
190	309	"/sbin/initctl",
191	310	"start",
192	311	"unity8",
193	312	binary_arg,
194	313	extra_args,
195	314	] + ["%s=%s" % (k, v) for k, v in self._environment.iteritems()],
196	315	stderr=subprocess.STDOUT,
197	316	)
200	317		307
201	318	self.addCleanup(self._cleanup_launching_upstart_unity)	308	self.addCleanup(self._cleanup_launching_upstart_unity)
202	319		309
209	320	pid = int(output.split()[-1])	310	return restart_unity_with_testability(*all_args)
204	321
205	322	return get_proxy_object_for_existing_process(
206	323	pid=pid,
207	324	emulator_base=UnityEmulatorBase,
208	325	)
210	326		311
211	327	def _cleanup_launching_upstart_unity(self):	312	def _cleanup_launching_upstart_unity(self):
212	328	logger.info("Stopping unity")	313	logger.info("Stopping unity")
213	329	try:	314	try:
214	330	subprocess.check_output(	315	subprocess.check_output(
216	331	["/sbin/initctl", "stop", "unity8"], stderr=subprocess.STDOUT)	316	["/sbin/initctl", "stop", "unity8"],
217			317	stderr=subprocess.STDOUT
218			318	)
219	332	except subprocess.CalledProcessError:	319	except subprocess.CalledProcessError:
220	333	logger.warning("Appears unity was already stopped!")	320	logger.warning("Appears unity was already stopped!")
221	334		321
222	335		322
223	=== modified file 'tests/autopilot/unity8/shell/tests/test_hud.py'
224	--- tests/autopilot/unity8/shell/tests/test_hud.py 2013-10-02 09:24:10 +0000
225	+++ tests/autopilot/unity8/shell/tests/test_hud.py 2013-11-19 20:53:31 +0000
226	@@ -19,6 +19,7 @@
227	19		19
228	20	from __future__ import absolute_import	20	from __future__ import absolute_import
229	21		21
230			22	from unity8.process_helpers import unlock_unity
231	22	from unity8.shell import with_lightdm_mock, DragMixin	23	from unity8.shell import with_lightdm_mock, DragMixin
232	23	from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios	24	from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios
233	24		25
234	@@ -38,8 +39,8 @@
235	38	The button must disappear when touching somewhere on the screen except the button itself.	39	The button must disappear when touching somewhere on the screen except the button itself.
236	39		40
237	40	"""	41	"""
240	41	self.launch_unity()	42	unity_proxy = self.launch_unity()
241	42	self.main_window.get_greeter().swipe()	43	unlock_unity(unity_proxy)
242	43	window = self.main_window.get_qml_view()	44	window = self.main_window.get_qml_view()
243	44	hud_show_button = self.main_window.get_hud_show_button()	45	hud_show_button = self.main_window.get_hud_show_button()
244	45	edge_drag_area = self.main_window.get_hud_edge_drag_area()	46	edge_drag_area = self.main_window.get_hud_edge_drag_area()
245	@@ -80,8 +81,8 @@
246	80	Test that the hud button stays on screen and tapping it opens the hud.	81	Test that the hud button stays on screen and tapping it opens the hud.
247	81		82
248	82	"""	83	"""
251	83	self.launch_unity()	84	unity_proxy = self.launch_unity()
252	84	self.main_window.get_greeter().swipe()	85	unlock_unity(unity_proxy)
253	85	window = self.main_window.get_qml_view()	86	window = self.main_window.get_qml_view()
254	86	hud_show_button = self.main_window.get_hud_show_button()	87	hud_show_button = self.main_window.get_hud_show_button()
255	87	hud = self.main_window.get_hud()	88	hud = self.main_window.get_hud()
256	@@ -117,8 +118,8 @@
257	117		118
258	118	def test_hide_hud_click(self):	119	def test_hide_hud_click(self):
259	119	"""Tapping the close button of the Hud must dismiss it."""	120	"""Tapping the close button of the Hud must dismiss it."""
262	120	self.launch_unity()	121	unity_proxy = self.launch_unity()
263	121	self.main_window.get_greeter().swipe()	122	unlock_unity(unity_proxy)
264	122	hud = self.main_window.get_hud()	123	hud = self.main_window.get_hud()
265	123		124
266	124	self._launch_test_app_from_app_screen()	125	self._launch_test_app_from_app_screen()
267	@@ -134,8 +135,8 @@
268	134	released downward.	135	released downward.
269	135		136
270	136	"""	137	"""
273	137	self.launch_unity()	138	unity_proxy = self.launch_unity()
274	138	self.main_window.get_greeter().swipe()	139	unlock_unity(unity_proxy)
275	139	window = self.main_window.get_qml_view()	140	window = self.main_window.get_qml_view()
276	140	hud = self.main_window.get_hud()	141	hud = self.main_window.get_hud()
277	141		142
278	@@ -152,8 +153,8 @@
279	152		153
280	153	def test_launcher_hides_hud(self):	154	def test_launcher_hides_hud(self):
281	154	"""Opening the Launcher while the Hud is active must close the Hud."""	155	"""Opening the Launcher while the Hud is active must close the Hud."""
284	155	self.launch_unity()	156	unity_proxy = self.launch_unity()
285	156	self.main_window.get_greeter().swipe()	157	unlock_unity(unity_proxy)
286	157	hud = self.main_window.get_hud()	158	hud = self.main_window.get_hud()
287	158	launcher = self.main_window.get_launcher()	159	launcher = self.main_window.get_launcher()
288	159		160
289	160		161
290	=== modified file 'tests/autopilot/unity8/shell/tests/test_notifications.py'
291	--- tests/autopilot/unity8/shell/tests/test_notifications.py 2013-11-01 13:59:50 +0000
292	+++ tests/autopilot/unity8/shell/tests/test_notifications.py 2013-11-19 20:53:31 +0000
293	@@ -21,6 +21,7 @@
294	21		21
295	22	from __future__ import absolute_import	22	from __future__ import absolute_import
296	23		23
297			24	from unity8.process_helpers import unlock_unity
298	24	from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios	25	from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios
299	25		26
300	26	from testtools.matchers import Equals, NotEquals	27	from testtools.matchers import Equals, NotEquals
301	@@ -118,9 +119,8 @@
302	118		119
303	119	def test_interactive(self):	120	def test_interactive(self):
304	120	"""Interactive notification must react upon click on itself."""	121	"""Interactive notification must react upon click on itself."""
308	121	self.launch_unity()	122	unity_proxy = self.launch_unity()
309	122	greeter = self.main_window.get_greeter()	123	unlock_unity(unity_proxy)
307	123	greeter.swipe()
310	124		124
311	125	notify_list = self._get_notifications_list()	125	notify_list = self._get_notifications_list()
312	126		126
313	@@ -158,9 +158,8 @@
314	158	def test_sd_incoming_call(self):	158	def test_sd_incoming_call(self):
315	159	"""Rejecting a call should make notification expand and	159	"""Rejecting a call should make notification expand and
316	160	offer more options."""	160	offer more options."""
320	161	self.launch_unity()	161	unity_proxy = self.launch_unity()
321	162	greeter = self.main_window.get_greeter()	162	unlock_unity(unity_proxy)
319	163	greeter.swipe()
322	164		163
323	165	notify_list = self._get_notifications_list()	164	notify_list = self._get_notifications_list()
324	166		165
325	@@ -336,9 +335,8 @@
326	336		335
327	337	def test_icon_summary_body(self):	336	def test_icon_summary_body(self):
328	338	"""Notification must display the expected summary and body text."""	337	"""Notification must display the expected summary and body text."""
332	339	self.launch_unity()	338	unity_proxy = self.launch_unity()
333	340	greeter = self.main_window.get_greeter()	339	unlock_unity(unity_proxy)
331	341	greeter.swipe()
334	342		340
335	343	notify_list = self._get_notifications_list()	341	notify_list = self._get_notifications_list()
336	344		342
337	@@ -377,9 +375,8 @@
338	377	def test_icon_summary(self):	375	def test_icon_summary(self):
339	378	"""Notification must display the expected summary and secondary	376	"""Notification must display the expected summary and secondary
340	379	icon."""	377	icon."""
344	380	self.launch_unity()	378	unity_proxy = self.launch_unity()
345	381	greeter = self.main_window.get_greeter()	379	unlock_unity(unity_proxy)
343	382	greeter.swipe()
346	383		380
347	384	notify_list = self._get_notifications_list()	381	notify_list = self._get_notifications_list()
348	385		382
349	@@ -416,9 +413,8 @@
350	416	def test_urgency_order(self):	413	def test_urgency_order(self):
351	417	"""Notifications must be displayed in order according to their	414	"""Notifications must be displayed in order according to their
352	418	urgency."""	415	urgency."""
356	419	self.launch_unity()	416	unity_proxy = self.launch_unity()
357	420	greeter = self.main_window.get_greeter()	417	unlock_unity(unity_proxy)
355	421	greeter.swipe()
358	422		418
359	423	notify_list = self._get_notifications_list()	419	notify_list = self._get_notifications_list()
360	424		420
361	@@ -504,9 +500,8 @@
362	504		500
363	505	def test_summary_and_body(self):	501	def test_summary_and_body(self):
364	506	"""Notification must display the expected summary- and body-text."""	502	"""Notification must display the expected summary- and body-text."""
368	507	self.launch_unity()	503	unity_proxy = self.launch_unity()
369	508	greeter = self.main_window.get_greeter()	504	unlock_unity(unity_proxy)
367	509	greeter.swipe()
370	510		505
371	511	notify_list = self._get_notifications_list()	506	notify_list = self._get_notifications_list()
372	512		507
373	@@ -518,6 +513,7 @@
374	518		513
375	519	notification = notify_list.wait_select_single(	514	notification = notify_list.wait_select_single(
376	520	'Notification', objectName='notification1')	515	'Notification', objectName='notification1')
377			516
378	521	self._assert_notification(	517	self._assert_notification(
379	522	notification,	518	notification,
380	523	summary,	519	summary,
381	@@ -529,9 +525,8 @@
382	529		525
383	530	def test_summary_only(self):	526	def test_summary_only(self):
384	531	"""Notification must display only the expected summary-text."""	527	"""Notification must display only the expected summary-text."""
388	532	self.launch_unity()	528	unity_proxy = self.launch_unity()
389	533	greeter = self.main_window.get_greeter()	529	unlock_unity(unity_proxy)
387	534	greeter.swipe()
390	535		530
391	536	notify_list = self._get_notifications_list()	531	notify_list = self._get_notifications_list()
392	537		532
393	@@ -548,9 +543,8 @@
394	548	def test_update_notification_same_layout(self):	543	def test_update_notification_same_layout(self):
395	549	"""Notification must allow updating its contents while being	544	"""Notification must allow updating its contents while being
396	550	displayed."""	545	displayed."""
400	551	self.launch_unity()	546	unity_proxy = self.launch_unity()
401	552	greeter = self.main_window.get_greeter()	547	unlock_unity(unity_proxy)
399	553	greeter.swipe()
402	554		548
403	555	notify_list = self._get_notifications_list()	549	notify_list = self._get_notifications_list()
404	556		550
405	@@ -587,9 +581,8 @@
406	587	def test_update_notification_layout_change(self):	581	def test_update_notification_layout_change(self):
407	588	"""Notification must allow updating its contents and layout while	582	"""Notification must allow updating its contents and layout while
408	589	being displayed."""	583	being displayed."""
412	590	self.launch_unity()	584	unity_proxy = self.launch_unity()
413	591	greeter = self.main_window.get_greeter()	585	unlock_unity(unity_proxy)
411	592	greeter.swipe()
414	593		586
415	594	notify_list = self._get_notifications_list()	587	notify_list = self._get_notifications_list()
416	595		588
417	@@ -612,6 +605,7 @@
418	612		605
419	613	get_notification = lambda: notify_list.wait_select_single(	606	get_notification = lambda: notify_list.wait_select_single(
420	614	'Notification', objectName='notification1')	607	'Notification', objectName='notification1')
421			608
422	615	self._assert_notification(	609	self._assert_notification(
423	616	get_notification(),	610	get_notification(),
424	617	summary,	611	summary,
425	@@ -633,9 +627,8 @@
426	633		627
427	634	def test_append_hint(self):	628	def test_append_hint(self):
428	635	"""Notification has to accumulate body-text using append-hint."""	629	"""Notification has to accumulate body-text using append-hint."""
432	636	self.launch_unity()	630	unity_proxy = self.launch_unity()
433	637	greeter = self.main_window.get_greeter()	631	unlock_unity(unity_proxy)
431	638	greeter.swipe()
434	639		632
435	640	notify_list = self._get_notifications_list()	633	notify_list = self._get_notifications_list()
436	641		634
437	@@ -654,6 +647,7 @@
438	654		647
439	655	get_notification = lambda: notify_list.wait_select_single(	648	get_notification = lambda: notify_list.wait_select_single(
440	656	'Notification', objectName='notification1')	649	'Notification', objectName='notification1')
441			650
442	657	notification = get_notification()	651	notification = get_notification()
443	658	self._assert_notification(	652	self._assert_notification(
444	659	notification,	653	notification,
445	@@ -685,6 +679,7 @@
446	685	hints=[('x-canonical-append', 'true')]	679	hints=[('x-canonical-append', 'true')]
447	686	)	680	)
448	687	notification.show()	681	notification.show()
449			682
450	688	get_notification = lambda: notify_list.wait_select_single(	683	get_notification = lambda: notify_list.wait_select_single(
451	689	'Notification',	684	'Notification',
452	690	objectName='notification1'	685	objectName='notification1'