1
=== modified file 'autopilot/display/__init__.py'
2
--- autopilot/display/__init__.py	2016-11-22 13:12:14 +0000
3
+++ autopilot/display/__init__.py	2017-03-13 14:06:25 +0000
4
@@ -107,8 +107,8 @@
5
107
            return Display()
107
            return Display()
6
108
108
7
109
        backends = OrderedDict()
109
        backends = OrderedDict()
8
110
        backends['X11'] = get_x11_display
9
110
        backends['UPA'] = get_upa_display
111
        backends['UPA'] = get_upa_display
10
111
        backends['X11'] = get_x11_display
11
112
        return _pick_backend(backends, preferred_backend)
112
        return _pick_backend(backends, preferred_backend)
12
113
113
13
114
    class BlacklistedDriverError(RuntimeError):
114
    class BlacklistedDriverError(RuntimeError):
14
115
115
15
=== modified file 'autopilot/input/__init__.py'
16
--- autopilot/input/__init__.py	2016-11-22 12:42:52 +0000
17
+++ autopilot/input/__init__.py	2017-03-13 14:06:25 +0000
18
@@ -57,6 +57,9 @@
19
57
57
20
58
from collections import OrderedDict
58
from collections import OrderedDict
21
59
from contextlib import contextmanager
59
from contextlib import contextmanager
22
60
23
61
import psutil
24
62
25
60
from autopilot.input._common import get_center_point
63
from autopilot.input._common import get_center_point
26
61
from autopilot.utilities import _pick_backend, CleanupRegistered
64
from autopilot.utilities import _pick_backend, CleanupRegistered
27
62
65
28
@@ -119,16 +122,21 @@
29
119
122
30
120
        def get_osk_kb():
123
        def get_osk_kb():
31
121
            try:
124
            try:
34
122
                from autopilot.input._osk import Keyboard
125
                maliit = [p for p in
35
123
                return Keyboard()
126
                          psutil.process_iter() if p.name() == 'maliit-server']
36
127
                if maliit:
37
128
                    from autopilot.input._osk import Keyboard
38
129
                    return Keyboard()
39
130
                else:
40
131
                    raise RuntimeError('maliit-server is not running')
41
124
            except ImportError as e:
132
            except ImportError as e:
42
125
                e.args += ("Unable to import the OSK backend",)
133
                e.args += ("Unable to import the OSK backend",)
43
126
                raise
134
                raise
44
127
135
45
128
        backends = OrderedDict()
136
        backends = OrderedDict()
46
137
        backends['X11'] = get_x11_kb
47
138
        backends['OSK'] = get_osk_kb
48
129
        backends['UInput'] = get_uinput_kb
139
        backends['UInput'] = get_uinput_kb
49
130
        backends['OSK'] = get_osk_kb
50
131
        backends['X11'] = get_x11_kb
51
132
        return _pick_backend(backends, preferred_backend)
140
        return _pick_backend(backends, preferred_backend)
52
133
141
53
134
    @contextmanager
142
    @contextmanager
54
135
143
55
=== added file 'autopilot/tests/unit/test_display.py'
56
--- autopilot/tests/unit/test_display.py	1970-01-01 00:00:00 +0000
57
+++ autopilot/tests/unit/test_display.py	2017-03-13 14:06:25 +0000
58
@@ -0,0 +1,33 @@
59
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
60
2
#
61
3
# Autopilot Functional Test Tool
62
4
# Copyright (C) 2016 Canonical
63
5
#
64
6
# This program is free software: you can redistribute it and/or modify
65
7
# it under the terms of the GNU General Public License as published by
66
8
# the Free Software Foundation, either version 3 of the License, or
67
9
# (at your option) any later version.
68
10
#
69
11
# This program is distributed in the hope that it will be useful,
70
12
# but WITHOUT ANY WARRANTY; without even the implied warranty of
71
13
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
72
14
# GNU General Public License for more details.
73
15
#
74
16
# You should have received a copy of the GNU General Public License
75
17
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
76
18
#
77
19
import unittest
78
20
from unittest.mock import patch
79
21
from autopilot.display import Display
80
22
81
23
82
24
class DisplayTestCase(unittest.TestCase):
83
25
84
26
    @patch('autopilot.display._pick_backend')
85
27
    def test_input_backends_default_order(self, pick_backend):
86
28
        d = Display()
87
29
        d.create()
88
30
89
31
        backends = list(pick_backend.call_args[0][0].items())
90
32
        self.assertTrue(backends[0][0] == 'X11')
91
33
        self.assertTrue(backends[1][0] == 'UPA')
92
0
34
93
=== modified file 'autopilot/tests/unit/test_input.py'
94
--- autopilot/tests/unit/test_input.py	2016-06-24 11:13:25 +0000
95
+++ autopilot/tests/unit/test_input.py	2017-03-13 14:06:25 +0000
96
@@ -18,6 +18,7 @@
97
18
#
18
#
98
19
19
99
20
import logging
20
import logging
100
21
import unittest
101
21
22
102
22
import testscenarios
23
import testscenarios
103
23
from evdev import ecodes, uinput
24
from evdev import ecodes, uinput
104
@@ -30,7 +31,7 @@
105
30
    tests,
31
    tests,
106
31
    utilities
32
    utilities
107
32
)
33
)
109
33
from autopilot.input import _uinput, get_center_point
34
from autopilot.input import _uinput, get_center_point, Keyboard
110
34
35
111
35
36
112
36
class Empty(object):
37
class Empty(object):
113
@@ -1101,3 +1102,16 @@
114
1101
        self.assert_power_button_press_release_emitted_write_and_sync(
1102
        self.assert_power_button_press_release_emitted_write_and_sync(
115
1102
            device._device.mock_calls
1103
            device._device.mock_calls
116
1103
        )
1104
        )
117
1105
118
1106
119
1107
class KeyboardTestCase(unittest.TestCase):
120
1108
121
1109
    @patch('autopilot.input._pick_backend')
122
1110
    def test_input_backends_default_order(self, pick_backend):
123
1111
        k = Keyboard()
124
1112
        k.create()
125
1113
126
1114
        backends = list(pick_backend.call_args[0][0].items())
127
1115
        self.assertTrue(backends[0][0] == 'X11')
128
1116
        self.assertTrue(backends[1][0] == 'OSK')
129
1117
        self.assertTrue(backends[2][0] == 'UInput')
Reviewer	Review Type	Date Requested	Status
Richard Huddie (community)			Approve on 2017-03-13
platform-qa-bot	continuous-integration		Approve on 2017-03-13
Heber Parrucci (community)		2017-03-08	Approve on 2017-03-08
Review via email: mp+319367@code.launchpad.net
1	=== modified file 'autopilot/display/__init__.py'
2	--- autopilot/display/__init__.py 2016-11-22 13:12:14 +0000
3	+++ autopilot/display/__init__.py 2017-03-13 14:06:25 +0000
4	@@ -107,8 +107,8 @@
5	107	return Display()	107	return Display()
6	108		108
7	109	backends = OrderedDict()	109	backends = OrderedDict()
8			110	backends['X11'] = get_x11_display
9	110	backends['UPA'] = get_upa_display	111	backends['UPA'] = get_upa_display
10	111	backends['X11'] = get_x11_display
11	112	return _pick_backend(backends, preferred_backend)	112	return _pick_backend(backends, preferred_backend)
12	113		113
13	114	class BlacklistedDriverError(RuntimeError):	114	class BlacklistedDriverError(RuntimeError):
14	115		115
15	=== modified file 'autopilot/input/__init__.py'
16	--- autopilot/input/__init__.py 2016-11-22 12:42:52 +0000
17	+++ autopilot/input/__init__.py 2017-03-13 14:06:25 +0000
18	@@ -57,6 +57,9 @@
19	57		57
20	58	from collections import OrderedDict	58	from collections import OrderedDict
21	59	from contextlib import contextmanager	59	from contextlib import contextmanager
22			60
23			61	import psutil
24			62
25	60	from autopilot.input._common import get_center_point	63	from autopilot.input._common import get_center_point
26	61	from autopilot.utilities import _pick_backend, CleanupRegistered	64	from autopilot.utilities import _pick_backend, CleanupRegistered
27	62		65
28	@@ -119,16 +122,21 @@
29	119		122
30	120	def get_osk_kb():	123	def get_osk_kb():
31	121	try:	124	try:
34	122	from autopilot.input._osk import Keyboard	125	maliit = [p for p in
35	123	return Keyboard()	126	psutil.process_iter() if p.name() == 'maliit-server']
36			127	if maliit:
37			128	from autopilot.input._osk import Keyboard
38			129	return Keyboard()
39			130	else:
40			131	raise RuntimeError('maliit-server is not running')
41	124	except ImportError as e:	132	except ImportError as e:
42	125	e.args += ("Unable to import the OSK backend",)	133	e.args += ("Unable to import the OSK backend",)
43	126	raise	134	raise
44	127		135
45	128	backends = OrderedDict()	136	backends = OrderedDict()
46			137	backends['X11'] = get_x11_kb
47			138	backends['OSK'] = get_osk_kb
48	129	backends['UInput'] = get_uinput_kb	139	backends['UInput'] = get_uinput_kb
49	130	backends['OSK'] = get_osk_kb
50	131	backends['X11'] = get_x11_kb
51	132	return _pick_backend(backends, preferred_backend)	140	return _pick_backend(backends, preferred_backend)
52	133		141
53	134	@contextmanager	142	@contextmanager
54	135		143
55	=== added file 'autopilot/tests/unit/test_display.py'
56	--- autopilot/tests/unit/test_display.py 1970-01-01 00:00:00 +0000
57	+++ autopilot/tests/unit/test_display.py 2017-03-13 14:06:25 +0000
58	@@ -0,0 +1,33 @@
59			1	# -- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 --
60			2	#
61			3	# Autopilot Functional Test Tool
62			4	# Copyright (C) 2016 Canonical
63			5	#
64			6	# This program is free software: you can redistribute it and/or modify
65			7	# it under the terms of the GNU General Public License as published by
66			8	# the Free Software Foundation, either version 3 of the License, or
67			9	# (at your option) any later version.
68			10	#
69			11	# This program is distributed in the hope that it will be useful,
70			12	# but WITHOUT ANY WARRANTY; without even the implied warranty of
71			13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
72			14	# GNU General Public License for more details.
73			15	#
74			16	# You should have received a copy of the GNU General Public License
75			17	# along with this program. If not, see <http://www.gnu.org/licenses/>.
76			18	#
77			19	import unittest
78			20	from unittest.mock import patch
79			21	from autopilot.display import Display
80			22
81			23
82			24	class DisplayTestCase(unittest.TestCase):
83			25
84			26	@patch('autopilot.display._pick_backend')
85			27	def test_input_backends_default_order(self, pick_backend):
86			28	d = Display()
87			29	d.create()
88			30
89			31	backends = list(pick_backend.call_args[0][0].items())
90			32	self.assertTrue(backends[0][0] == 'X11')
91			33	self.assertTrue(backends[1][0] == 'UPA')
92	0		34
93	=== modified file 'autopilot/tests/unit/test_input.py'
94	--- autopilot/tests/unit/test_input.py 2016-06-24 11:13:25 +0000
95	+++ autopilot/tests/unit/test_input.py 2017-03-13 14:06:25 +0000
96	@@ -18,6 +18,7 @@
97	18	#	18	#
98	19		19
99	20	import logging	20	import logging
100			21	import unittest
101	21		22
102	22	import testscenarios	23	import testscenarios
103	23	from evdev import ecodes, uinput	24	from evdev import ecodes, uinput
104	@@ -30,7 +31,7 @@
105	30	tests,	31	tests,
106	31	utilities	32	utilities
107	32	)	33	)
109	33	from autopilot.input import _uinput, get_center_point	34	from autopilot.input import _uinput, get_center_point, Keyboard
110	34		35
111	35		36
112	36	class Empty(object):	37	class Empty(object):
113	@@ -1101,3 +1102,16 @@
114	1101	self.assert_power_button_press_release_emitted_write_and_sync(	1102	self.assert_power_button_press_release_emitted_write_and_sync(
115	1102	device._device.mock_calls	1103	device._device.mock_calls
116	1103	)	1104	)
117			1105
118			1106
119			1107	class KeyboardTestCase(unittest.TestCase):
120			1108
121			1109	@patch('autopilot.input._pick_backend')
122			1110	def test_input_backends_default_order(self, pick_backend):
123			1111	k = Keyboard()
124			1112	k.create()
125			1113
126			1114	backends = list(pick_backend.call_args[0][0].items())
127			1115	self.assertTrue(backends[0][0] == 'X11')
128			1116	self.assertTrue(backends[1][0] == 'OSK')
129			1117	self.assertTrue(backends[2][0] == 'UInput')