1
=== modified file 'tests/autopilot/ubuntu_weather_app/tests/__init__.py'
2
--- tests/autopilot/ubuntu_weather_app/tests/__init__.py	2013-12-13 15:30:46 +0000
3
+++ tests/autopilot/ubuntu_weather_app/tests/__init__.py	2013-12-17 14:44:53 +0000
4
@@ -14,6 +14,7 @@
5
14
import sqlite3
14
import sqlite3
6
15
import time
15
import time
7
16
import logging
16
import logging
8
17
import md5
9
17
18
10
18
from autopilot.input import Mouse, Touch, Pointer
19
from autopilot.input import Mouse, Touch, Pointer
11
19
from autopilot.platform import model
20
from autopilot.platform import model
12
@@ -83,6 +84,27 @@
13
83
            "com.ubuntu.weather",
84
            "com.ubuntu.weather",
14
84
            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
85
            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
15
85
86
16
87
    def launch_and_quit_app(self, database):
17
88
        self.launch_app()
18
89
        self.assertThat(
19
90
            lambda: os.path.exists(database),
20
91
            Eventually(Equals(True))
21
92
        )
22
93
23
94
        # When calling launch_app an instance of the spawned process
24
95
        # control object will be stored in self.app.process, and a cleanup
25
96
        # handler will be registered that essentially kills the process.
26
97
        # Therefore, by triggering the cleanup handler here we're killing the
27
98
        # process and removing the handler, which allows a clean launch of
28
99
        # the process during regular test setup.
29
100
        self.doCleanups()
30
101
31
102
    def ensure_db(self):
32
103
        path = os.path.expanduser("~/.local/share/com.ubuntu.weather/Databases")
33
104
        db = os.path.join(path, md5.md5("com.ubuntu.weather").hexdigest() + ".sqlite")
34
105
        if not os.path.exists(db):
35
106
            self.launch_and_quit_app(db)
36
107
37
86
    def get_qml_view(self):
108
    def get_qml_view(self):
38
87
        return self.app.select_single("QQuickView")
109
        return self.app.select_single("QQuickView")
39
88
110
40
89
111
41
=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_mainview.py'
42
--- tests/autopilot/ubuntu_weather_app/tests/test_mainview.py	2013-12-11 20:24:42 +0000
43
+++ tests/autopilot/ubuntu_weather_app/tests/test_mainview.py	2013-12-17 14:44:53 +0000
44
@@ -27,10 +27,7 @@
45
27
    """ This is needed to wait for the application to start.
27
    """ This is needed to wait for the application to start.
46
28
        In the testfarm, the application may take some time to show up."""
28
        In the testfarm, the application may take some time to show up."""
47
29
    def setUp(self):
29
    def setUp(self):
52
30
        #close app
30
        self.ensure_db()
49
31
        #logger.debug("Closing app")
50
32
        #self.doCleanups()
51
33
        #wipe the existing database and create a new blank one
53
34
        self.create_blank_db()
31
        self.create_blank_db()
54
35
        # add settings to storage
32
        # add settings to storage
55
36
        logger.debug("Adding fake data to new database")
33
        logger.debug("Adding fake data to new database")
Status:	Rejected
Rejected by:	Nicholas Skaggs on 2014-02-13
Proposed branch:	lp:~om26er/ubuntu-weather-app/fix_db_tests
Merge into:	lp:ubuntu-weather-app/obsolete.trunk
Diff against target:	55 lines (+23/-4) 2 files modified tests/autopilot/ubuntu_weather_app/tests/__init__.py (+22/-0) tests/autopilot/ubuntu_weather_app/tests/test_mainview.py (+1/-4)
To merge this branch:	bzr merge lp:~om26er/ubuntu-weather-app/fix_db_tests
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Sergio Schvezov (community)			Abstain on 2013-12-17
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2013-12-17
Alan Pope 🍺🐧🐱 🦄 (community)		2013-12-17	Approve on 2013-12-17
Review via email: mp+199278@code.launchpad.net