1
=== modified file 'tests/autopilot/ubuntu_clock_app/tests/__init__.py'
2
--- tests/autopilot/ubuntu_clock_app/tests/__init__.py	2014-08-02 12:57:23 +0000
3
+++ tests/autopilot/ubuntu_clock_app/tests/__init__.py	2014-08-08 22:30:40 +0000
4
@@ -22,8 +22,7 @@
5
22
import logging
22
import logging
6
23
import fixtures
23
import fixtures
7
24
24
10
25
from autopilot import input
25
from autopilot import logging as autopilot_logging
9
26
from autopilot.platform import model
11
27
from ubuntuuitoolkit import (
26
from ubuntuuitoolkit import (
12
28
    base,
27
    base,
13
29
    emulators as toolkit_emulators
28
    emulators as toolkit_emulators
14
@@ -40,52 +39,63 @@
15
40
    clock-app tests.
39
    clock-app tests.
16
41
40
17
42
    """
41
    """
22
43
    local_location = "../../app/ubuntu-clock-app.qml"
42
23
44
    local_backend_dir = "../../builddir/backend/"
43
    local_location = os.path.dirname(os.path.dirname(os.getcwd()))
24
45
    installed_location = "/usr/share/ubuntu-clock-app/app/ubuntu-clock-app.qml"
44
    local_location_qml = os.path.join(
25
46
    installed_backend_dir = "/usr/share/ubuntu-clock-app/builddir/backend/"
45
        local_location, 'app/ubuntu-clock-app.qml')
26
46
    local_location_backend = os.path.join(local_location, 'builddir/backend')
27
47
    installed_location_backend = \
28
48
        '/usr/share/ubuntu-clock-app/builddir/backend'
29
49
    installed_location_qml = \
30
50
        '/usr/share/ubuntu-clock-app/app/ubuntu-clock-app.qml'
31
51
32
52
    # note this directory could change to com.ubuntu.clock at some point
33
47
    sqlite_dir = os.path.expanduser(
53
    sqlite_dir = os.path.expanduser(
35
48
        "~/.local/share/com.ubuntu.clock")
54
        "~/.local/share/com.ubuntu.clock.devel")
36
49
    backup_dir = sqlite_dir + ".backup"
55
    backup_dir = sqlite_dir + ".backup"
37
50
56
38
51
    def setUp(self):
57
    def setUp(self):
39
52
        super(ClockAppTestCase, self).setUp()
40
53
        self.pointing_device = input.Pointer(self.input_device_class.create())
41
54
42
55
        self.useFixture(fixtures.EnvironmentVariable('LC_ALL', newvalue='C'))
43
56
44
57
        # backup and wipe db's before testing
58
        # backup and wipe db's before testing
45
58
        self.temp_move_sqlite_db()
59
        self.temp_move_sqlite_db()
46
59
        self.addCleanup(self.restore_sqlite_db)
60
        self.addCleanup(self.restore_sqlite_db)
47
60
61
57
61
        # turn off the OSK so it doesn't block screen elements
62
        launch, self.test_type = self.get_launcher_method_and_type()
58
62
        if model() != 'Desktop':
63
        self.useFixture(fixtures.EnvironmentVariable('LC_ALL', newvalue='C'))
59
63
            os.system("stop maliit-server")
64
        super(ClockAppTestCase, self).setUp()
60
64
            self.addCleanup(os.system, "start maliit-server")
65
61
65
66
        launch()
62
66
        if os.path.exists(self.local_location):
67
63
67
            self.launch_test_local()
68
    def get_launcher_method_and_type(self):
64
68
        elif os.path.exists(self.installed_location):
69
        if os.path.exists(self.local_location_backend):
65
69
            self.launch_test_installed()
70
            launcher = self.launch_test_local
66
71
            test_type = 'local'
67
72
        elif os.path.exists(self.installed_location_backend):
68
73
            launcher = self.launch_test_installed
69
74
            test_type = 'deb'
70
70
        else:
75
        else:
72
71
            self.launch_test_click()
76
            launcher = self.launch_test_click
73
77
            test_type = 'click'
74
78
        return launcher, test_type
75
72
79
76
80
    @autopilot_logging.log_action(logger.info)
77
73
    def launch_test_local(self):
81
    def launch_test_local(self):
78
74
        self.app = self.launch_test_application(
82
        self.app = self.launch_test_application(
79
75
            base.get_qmlscene_launch_command(),
83
            base.get_qmlscene_launch_command(),
82
76
            self.local_location,
84
            self.local_location_qml,
83
77
            "-I", self.local_backend_dir,
85
            "-I", self.local_location_backend,
84
78
            app_type='qt',
86
            app_type='qt',
85
79
            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
87
            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
86
80
88
87
89
    @autopilot_logging.log_action(logger.info)
88
81
    def launch_test_installed(self):
90
    def launch_test_installed(self):
89
82
        self.app = self.launch_test_application(
91
        self.app = self.launch_test_application(
90
83
            base.get_qmlscene_launch_command(),
92
            base.get_qmlscene_launch_command(),
93
84
            self.installed_location,
93
            self.installed_location_qml,
94
85
            "-I", self.installed_backend_dir,
94
            "-I", self.installed_location_backend,
95
86
            app_type='qt',
95
            app_type='qt',
96
87
            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
96
            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
97
88
97
98
98
    @autopilot_logging.log_action(logger.info)
99
89
    def launch_test_click(self):
99
    def launch_test_click(self):
100
90
        self.app = self.launch_click_package(
100
        self.app = self.launch_click_package(
101
91
            "com.ubuntu.clock.devel",
101
            "com.ubuntu.clock.devel",
Status:	Merged
Approved by:	Nekhelesh Ramananthan on 2014-08-11
Approved revision:	46
Merged at revision:	46
Proposed branch:	lp:~nskaggs/ubuntu-clock-app/fix-ap-setup
Merge into:	lp:ubuntu-clock-app
Diff against target:	101 lines (+36/-26) 1 file modified tests/autopilot/ubuntu_clock_app/tests/__init__.py (+36/-26)
To merge this branch:	bzr merge lp:~nskaggs/ubuntu-clock-app/fix-ap-setup
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Needs Fixing on 2014-08-11
Nekhelesh Ramananthan		2014-08-08	Approve on 2014-08-11
Review via email: mp+230187@code.launchpad.net