1
=== modified file 'tests/autopilot/unity8/indicators/tests/__init__.py'
2
--- tests/autopilot/unity8/indicators/tests/__init__.py	2014-03-27 22:07:43 +0000
3
+++ tests/autopilot/unity8/indicators/tests/__init__.py	2015-01-26 22:01:01 +0000
4
@@ -15,3 +15,38 @@
5
15
#
15
#
6
16
# You should have received a copy of the GNU General Public License
16
# You should have received a copy of the GNU General Public License
7
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/>.
8
18
9
19
from unity8 import process_helpers
10
20
from unity8.shell.tests import (
11
21
    UnityTestCase,
12
22
    _get_device_emulation_scenarios,
13
23
)
14
24
15
25
16
26
class IndicatorTestCase(UnityTestCase):
17
27
18
28
    scenarios = _get_device_emulation_scenarios()
19
29
20
30
    def setUp(self):
21
31
        super(IndicatorTestCase, self).setUp()
22
32
        self._dirty_services = set()
23
33
        self.unity_proxy = self.launch_unity()
24
34
        process_helpers.unlock_unity(self.unity_proxy)
25
35
26
36
    def start_test_service(self, service_name, *args):
27
37
        """Restart a service (e.g. 'indicator-power-service') with test args.
28
38
29
39
        Adds a no-arguments restart to addCleanup() so that the system
30
40
        can reset to a nontest version of the service when the tests finish.
31
41
        """
32
42
        self._start_service(service_name, *args)
33
43
        if service_name not in self._dirty_services:
34
44
            self._dirty_services.add(service_name)
35
45
            self.addCleanup(self._start_service, service_name)
36
46
37
47
    @staticmethod
38
48
    def _start_service(service_name, *args):
39
49
        """Restart an upstart service; e.g. indicator-power-service"""
40
50
        if process_helpers.is_job_running(service_name):
41
51
            process_helpers.stop_job(service_name)
42
52
        process_helpers.start_job(service_name, *args)
43
18
53
44
=== modified file 'tests/autopilot/unity8/indicators/tests/test_indicators.py'
45
--- tests/autopilot/unity8/indicators/tests/test_indicators.py	2014-10-13 09:23:34 +0000
46
+++ tests/autopilot/unity8/indicators/tests/test_indicators.py	2015-01-26 22:01:01 +0000
47
@@ -18,24 +18,10 @@
48
18
18
49
19
from __future__ import absolute_import
19
from __future__ import absolute_import
50
20
20
51
21
from autopilot import platform
52
21
from testscenarios import multiply_scenarios
22
from testscenarios import multiply_scenarios
53
22
23
70
23
from autopilot import platform
24
from unity8.indicators.tests import IndicatorTestCase
55
24
56
25
from unity8.process_helpers import unlock_unity
57
26
from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios
58
27
59
28
60
29
class IndicatorTestCase(UnityTestCase):
61
30
62
31
    device_emulation_scenarios = _get_device_emulation_scenarios()
63
32
64
33
    def setUp(self):
65
34
        if platform.model() == 'Desktop':
66
35
            self.skipTest('Test cannot be run on the desktop.')
67
36
        super(IndicatorTestCase, self).setUp()
68
37
        self.unity_proxy = self.launch_unity()
69
38
        unlock_unity(self.unity_proxy)
71
39
25
72
40
26
73
41
class IndicatorExistsTestCase(IndicatorTestCase):
27
class IndicatorExistsTestCase(IndicatorTestCase):
74
@@ -51,7 +37,7 @@
75
51
    ]
37
    ]
76
52
    scenarios = multiply_scenarios(
38
    scenarios = multiply_scenarios(
77
53
        indicator_scenarios,
39
        indicator_scenarios,
79
54
        IndicatorTestCase.device_emulation_scenarios
40
        IndicatorTestCase.scenarios
80
55
    )
41
    )
81
56
42
82
57
    def setUp(self):
43
    def setUp(self):
83
@@ -59,6 +45,9 @@
84
59
        if (platform.model() == 'Nexus 10' and
45
        if (platform.model() == 'Nexus 10' and
85
60
                self.indicator_name == 'indicator-bluetooth'):
46
                self.indicator_name == 'indicator-bluetooth'):
86
61
            self.skipTest('Nexus 10 does not have bluetooth at the moment.')
47
            self.skipTest('Nexus 10 does not have bluetooth at the moment.')
87
48
        if platform.model() == 'Desktop':
88
49
            # names exported differently in unity7
89
50
            self.skipTest('Test cannot be run on the desktop.')
90
62
51
91
63
    def test_indicator_exists(self):
52
    def test_indicator_exists(self):
92
64
        self.main_window._get_indicator_panel_item(
53
        self.main_window._get_indicator_panel_item(
93
@@ -86,7 +75,7 @@
94
86
    ]
75
    ]
95
87
    scenarios = multiply_scenarios(
76
    scenarios = multiply_scenarios(
96
88
        indicator_scenarios,
77
        indicator_scenarios,
98
89
        IndicatorTestCase.device_emulation_scenarios
78
        IndicatorTestCase.scenarios
99
90
    )
79
    )
100
91
80
101
92
    def setUp(self):
81
    def setUp(self):
102
@@ -94,6 +83,9 @@
103
94
        if (platform.model() == 'Nexus 10' and
83
        if (platform.model() == 'Nexus 10' and
104
95
                self.indicator_name == 'indicator-bluetooth'):
84
                self.indicator_name == 'indicator-bluetooth'):
105
96
            self.skipTest('Nexus 10 does not have bluetooth at the moment.')
85
            self.skipTest('Nexus 10 does not have bluetooth at the moment.')
106
86
        if platform.model() == 'Desktop':
107
87
            # names exported differently in unity7
108
88
            self.skipTest('Test cannot be run on the desktop.')
109
97
89
110
98
    def test_indicator_page_title_matches_widget(self):
90
    def test_indicator_page_title_matches_widget(self):
111
99
        """Swiping open an indicator must show its correct title.
91
        """Swiping open an indicator must show its correct title.
Status:	Work in progress
Proposed branch:	lp:~charlesk/unity8/indicator-tests
Merge into:	lp:unity8
Diff against target:	111 lines (+45/-18) 2 files modified tests/autopilot/unity8/indicators/tests/__init__.py (+35/-0) tests/autopilot/unity8/indicators/tests/test_indicators.py (+10/-18)
To merge this branch:	bzr merge lp:~charlesk/unity8/indicator-tests
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2015-03-19
Allan LeSage		2015-01-26	Pending
Review via email: mp+247639@code.launchpad.net
1	=== modified file 'tests/autopilot/unity8/indicators/tests/__init__.py'
2	--- tests/autopilot/unity8/indicators/tests/__init__.py 2014-03-27 22:07:43 +0000
3	+++ tests/autopilot/unity8/indicators/tests/__init__.py 2015-01-26 22:01:01 +0000
4	@@ -15,3 +15,38 @@
5	15	#	15	#
6	16	# You should have received a copy of the GNU General Public License	16	# You should have received a copy of the GNU General Public License
7	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/>.
8			18
9			19	from unity8 import process_helpers
10			20	from unity8.shell.tests import (
11			21	UnityTestCase,
12			22	_get_device_emulation_scenarios,
13			23	)
14			24
15			25
16			26	class IndicatorTestCase(UnityTestCase):
17			27
18			28	scenarios = _get_device_emulation_scenarios()
19			29
20			30	def setUp(self):
21			31	super(IndicatorTestCase, self).setUp()
22			32	self._dirty_services = set()
23			33	self.unity_proxy = self.launch_unity()
24			34	process_helpers.unlock_unity(self.unity_proxy)
25			35
26			36	def start_test_service(self, service_name, *args):
27			37	"""Restart a service (e.g. 'indicator-power-service') with test args.
28			38
29			39	Adds a no-arguments restart to addCleanup() so that the system
30			40	can reset to a nontest version of the service when the tests finish.
31			41	"""
32			42	self._start_service(service_name, *args)
33			43	if service_name not in self._dirty_services:
34			44	self._dirty_services.add(service_name)
35			45	self.addCleanup(self._start_service, service_name)
36			46
37			47	@staticmethod
38			48	def _start_service(service_name, *args):
39			49	"""Restart an upstart service; e.g. indicator-power-service"""
40			50	if process_helpers.is_job_running(service_name):
41			51	process_helpers.stop_job(service_name)
42			52	process_helpers.start_job(service_name, *args)
43	18		53
44	=== modified file 'tests/autopilot/unity8/indicators/tests/test_indicators.py'
45	--- tests/autopilot/unity8/indicators/tests/test_indicators.py 2014-10-13 09:23:34 +0000
46	+++ tests/autopilot/unity8/indicators/tests/test_indicators.py 2015-01-26 22:01:01 +0000
47	@@ -18,24 +18,10 @@
48	18		18
49	19	from __future__ import absolute_import	19	from __future__ import absolute_import
50	20		20
51			21	from autopilot import platform
52	21	from testscenarios import multiply_scenarios	22	from testscenarios import multiply_scenarios
53	22		23
70	23	from autopilot import platform	24	from unity8.indicators.tests import IndicatorTestCase
55	24
56	25	from unity8.process_helpers import unlock_unity
57	26	from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios
58	27
59	28
60	29	class IndicatorTestCase(UnityTestCase):
61	30
62	31	device_emulation_scenarios = _get_device_emulation_scenarios()
63	32
64	33	def setUp(self):
65	34	if platform.model() == 'Desktop':
66	35	self.skipTest('Test cannot be run on the desktop.')
67	36	super(IndicatorTestCase, self).setUp()
68	37	self.unity_proxy = self.launch_unity()
69	38	unlock_unity(self.unity_proxy)
71	39		25
72	40		26
73	41	class IndicatorExistsTestCase(IndicatorTestCase):	27	class IndicatorExistsTestCase(IndicatorTestCase):
74	@@ -51,7 +37,7 @@
75	51	]	37	]
76	52	scenarios = multiply_scenarios(	38	scenarios = multiply_scenarios(
77	53	indicator_scenarios,	39	indicator_scenarios,
79	54	IndicatorTestCase.device_emulation_scenarios	40	IndicatorTestCase.scenarios
80	55	)	41	)
81	56		42
82	57	def setUp(self):	43	def setUp(self):
83	@@ -59,6 +45,9 @@
84	59	if (platform.model() == 'Nexus 10' and	45	if (platform.model() == 'Nexus 10' and
85	60	self.indicator_name == 'indicator-bluetooth'):	46	self.indicator_name == 'indicator-bluetooth'):
86	61	self.skipTest('Nexus 10 does not have bluetooth at the moment.')	47	self.skipTest('Nexus 10 does not have bluetooth at the moment.')
87			48	if platform.model() == 'Desktop':
88			49	# names exported differently in unity7
89			50	self.skipTest('Test cannot be run on the desktop.')
90	62		51
91	63	def test_indicator_exists(self):	52	def test_indicator_exists(self):
92	64	self.main_window._get_indicator_panel_item(	53	self.main_window._get_indicator_panel_item(
93	@@ -86,7 +75,7 @@
94	86	]	75	]
95	87	scenarios = multiply_scenarios(	76	scenarios = multiply_scenarios(
96	88	indicator_scenarios,	77	indicator_scenarios,
98	89	IndicatorTestCase.device_emulation_scenarios	78	IndicatorTestCase.scenarios
99	90	)	79	)
100	91		80
101	92	def setUp(self):	81	def setUp(self):
102	@@ -94,6 +83,9 @@
103	94	if (platform.model() == 'Nexus 10' and	83	if (platform.model() == 'Nexus 10' and
104	95	self.indicator_name == 'indicator-bluetooth'):	84	self.indicator_name == 'indicator-bluetooth'):
105	96	self.skipTest('Nexus 10 does not have bluetooth at the moment.')	85	self.skipTest('Nexus 10 does not have bluetooth at the moment.')
106			86	if platform.model() == 'Desktop':
107			87	# names exported differently in unity7
108			88	self.skipTest('Test cannot be run on the desktop.')
109	97		89
110	98	def test_indicator_page_title_matches_widget(self):	90	def test_indicator_page_title_matches_widget(self):
111	99	"""Swiping open an indicator must show its correct title.	91	"""Swiping open an indicator must show its correct title.