1
=== modified file 'tests/autopilot/ubuntu_calculator_app/tests/__init__.py'
2
--- tests/autopilot/ubuntu_calculator_app/tests/__init__.py	2013-09-17 14:24:28 +0000
3
+++ tests/autopilot/ubuntu_calculator_app/tests/__init__.py	2013-09-27 16:31:24 +0000
4
@@ -32,6 +32,8 @@
5
32
        scenarios = [('with touch', dict(input_device_class=Touch))]
32
        scenarios = [('with touch', dict(input_device_class=Touch))]
6
33
33
7
34
    local_location = "../../ubuntu-calculator-app.qml"
34
    local_location = "../../ubuntu-calculator-app.qml"
8
35
    installed_location = "/usr/share/ubuntu-calculator-app/" \
9
36
                         "ubuntu-calculator-app.qml"
10
35
37
11
36
    sqlite_dir = os.path.expanduser(
38
    sqlite_dir = os.path.expanduser(
12
37
        "~/.local/share/Qt Project/QtQmlViewer/QML/OfflineStorage/Databases")
39
        "~/.local/share/Qt Project/QtQmlViewer/QML/OfflineStorage/Databases")
13
@@ -52,8 +54,10 @@
14
52
54
15
53
        if os.path.exists(self.local_location):
55
        if os.path.exists(self.local_location):
16
54
            self.launch_test_local()
56
            self.launch_test_local()
18
55
        else:
57
        elif os.path.exists(self.installed_location):
19
56
            self.launch_test_installed()
58
            self.launch_test_installed()
20
59
        else:
21
60
            self.launch_test_click()
22
57
61
23
58
    def launch_test_local(self):
62
    def launch_test_local(self):
24
59
        self.app = self.launch_test_application(
63
        self.app = self.launch_test_application(
25
@@ -65,12 +69,17 @@
26
65
    def launch_test_installed(self):
69
    def launch_test_installed(self):
27
66
        self.app = self.launch_test_application(
70
        self.app = self.launch_test_application(
28
67
            "qmlscene",
71
            "qmlscene",
30
68
            "/usr/share/ubuntu-calculator-app/ubuntu-calculator-app.qml",
72
            self.installed_location,
31
69
            "--desktop_file_hint="
73
            "--desktop_file_hint="
32
70
            "/usr/share/applications/ubuntu-calculator-app.desktop",
74
            "/usr/share/applications/ubuntu-calculator-app.desktop",
33
71
            app_type='qt',
75
            app_type='qt',
34
72
            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
76
            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
35
73
77
36
78
    def launch_test_click(self):
37
79
        self.app = self.launch_click_package(
38
80
            "com.ubuntu.ubuntu-calculator-app",
39
81
            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
40
82
41
74
    def temp_move_sqlite_db(self):
83
    def temp_move_sqlite_db(self):
42
75
        if os.path.exists(self.sqlite_dir):
84
        if os.path.exists(self.sqlite_dir):
43
76
            shutil.move(self.sqlite_dir, self.backup_dir)
85
            shutil.move(self.sqlite_dir, self.backup_dir)
Status:	Merged
Approved by:	Riccardo Padovani on 2013-09-28
Approved revision:	157
Merged at revision:	164
Proposed branch:	lp:~nskaggs/ubuntu-calculator-app/add-click-test-support
Merge into:	lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk
Diff against target:	43 lines (+11/-2) 1 file modified tests/autopilot/ubuntu_calculator_app/tests/__init__.py (+11/-2)
To merge this branch:	bzr merge lp:~nskaggs/ubuntu-calculator-app/add-click-test-support
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Riccardo Padovani		2013-09-27	Approve on 2013-09-28
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2013-09-27
Review via email: mp+188074@code.launchpad.net