1
=== modified file 'tests/autopilot/address_book_app/tests/__init__.py'
2
--- tests/autopilot/address_book_app/tests/__init__.py	2015-04-14 22:19:01 +0000
3
+++ tests/autopilot/address_book_app/tests/__init__.py	2015-05-14 04:42:25 +0000
4
@@ -16,6 +16,8 @@
5
16
16
6
17
"""address-book-app autopilot tests."""
17
"""address-book-app autopilot tests."""
7
18
18
8
19
import fixtures
9
20
import logging
10
19
import os
21
import os
11
20
import time
22
import time
12
21
import subprocess
23
import subprocess
13
@@ -28,6 +30,30 @@
14
28
import ubuntuuitoolkit
30
import ubuntuuitoolkit
15
29
from ubuntuuitoolkit import emulators as toolkit_emulators
31
from ubuntuuitoolkit import emulators as toolkit_emulators
16
30
32
17
33
logger = logging.getLogger(__name__)
18
34
19
35
20
36
class DisableOnScreenKeyboard(fixtures.Fixture):
21
37
    """Disable the OSK for the time of the test (Does nothing on desktop)."""
22
38
23
39
    def setUp(self):
24
40
        super().setUp()
25
41
        if model() != 'Desktop':
26
42
            self.toggle_keyboard(state='stop')
27
43
            self.addCleanup(self.toggle_keyboard, state='start')
28
44
29
45
    def toggle_keyboard(self, state):
30
46
        try:
31
47
            subprocess.check_output(
32
48
                ['/sbin/initctl', state, 'maliit-server'],
33
49
                stderr=subprocess.STDOUT
34
50
            )
35
51
        except subprocess.CalledProcessError as e:
36
52
            logger.error(
37
53
                'Failed to toggle state of keyboard to: {state}\n'
38
54
                'Error message: {msg}'.format(state=state, msg=e.output))
39
55
            raise
40
56
41
31
57
42
32
class AddressBookAppTestCase(AutopilotTestCase):
58
class AddressBookAppTestCase(AutopilotTestCase):
43
33
    """A common test case class that provides several useful methods for
59
    """A common test case class that provides several useful methods for
44
@@ -45,9 +71,7 @@
45
45
        self.pointing_device = toolkit_emulators.get_pointing_device()
71
        self.pointing_device = toolkit_emulators.get_pointing_device()
46
46
        super(AddressBookAppTestCase, self).setUp()
72
        super(AddressBookAppTestCase, self).setUp()
47
47
73
51
48
        # stop vkb
74
        self.useFixture(DisableOnScreenKeyboard())
49
49
        if model() != "Desktop":
50
50
            subprocess.check_call(["/sbin/initctl", "stop", "maliit-server"])
52
51
75
53
52
        if 'AUTOPILOT_APP' in os.environ:
76
        if 'AUTOPILOT_APP' in os.environ:
54
53
            self.app_bin = os.environ['AUTOPILOT_APP']
77
            self.app_bin = os.environ['AUTOPILOT_APP']
55
@@ -86,13 +110,6 @@
56
86
        AddressBookAppTestCase.ARGS = []
110
        AddressBookAppTestCase.ARGS = []
57
87
        self.main_window.visible.wait_for(True)
111
        self.main_window.visible.wait_for(True)
58
88
112
59
89
    def tearDown(self):
60
90
        super(AddressBookAppTestCase, self).tearDown()
61
91
62
92
        # start the vkb
63
93
        if model() != "Desktop":
64
94
            subprocess.check_call(["/sbin/initctl", "start", "maliit-server"])
65
95
66
96
    def launch_test_local(self):
113
    def launch_test_local(self):
67
97
        return self.launch_test_application(
114
        return self.launch_test_application(
68
98
            self.app_bin,
115
            self.app_bin,
Status:	Needs review
Proposed branch:	lp:~canonical-platform-qa/address-book-app/remove-teardown-ap-tests
Merge into:	lp:address-book-app
Diff against target:	68 lines (+27/-10) 1 file modified tests/autopilot/address_book_app/tests/__init__.py (+27/-10)
To merge this branch:	bzr merge lp:~canonical-platform-qa/address-book-app/remove-teardown-ap-tests
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Federico Gimenez (community)			Approve on 2015-05-14
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-05-14
Vincent Ladeuil (community)			Needs Information on 2015-05-12
Leo Arias (community)			Approve on 2015-05-12
Ubuntu Phablet Team		2015-05-12	Pending
Review via email: mp+258829@code.launchpad.net