Merge lp:~om26er/ubuntu-weather-app/fix_db_tests into lp:ubuntu-weather-app/obsolete.trunk

[Omer Akram]

make sure there is a local database before running the MainWindow tests

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:168
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/99/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/477
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/97
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/97
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-trusty-amd64-ci/11

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/99/rebuild

review: Needs Fixing (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Tests all pass here.

Ran 15 tests in 405.218s
OK

review: Approve

[Sergio Schvezov (sergiusens)]

Instead of waiting for
10 + self.main_window.visible.wait_for(True)

why not wait for the database file you care about to be created? If the app is responsible, the app being visible does not guarantee it has created the db

review: Needs Fixing

[lp:~om26er/ubuntu-weather-app/fix_db_tests]

169. By Omer Akram on 2013-12-17

don't wait for the app window to appear, rather wait for the database to be created

170. By Omer Akram on 2013-12-17

import md5

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:170
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/100/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/480
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/98
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/98
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-trusty-amd64-ci/12

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/100/rebuild

review: Approve (continuous-integration)

[Sergio Schvezov (sergiusens)]

review: Approve

[Sergio Schvezov (sergiusens)]

review: Abstain

[Nicholas Skaggs (nskaggs)]

I believe this is no longer relevant.

Unmerged revisions

170. By Omer Akram on 2013-12-17

import md5

169. By Omer Akram on 2013-12-17

don't wait for the app window to appear, rather wait for the database to be created

168. By Omer Akram on 2013-12-17

make sure we have a db before running tests

=== modified file 'tests/autopilot/ubuntu_weather_app/tests/__init__.py'
--- tests/autopilot/ubuntu_weather_app/tests/__init__.py	2013-12-13 15:30:46 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/__init__.py	2013-12-17 14:44:53 +0000
@@ -14,6 +14,7 @@
 import sqlite3
 import time
 import logging
+import md5
 
 from autopilot.input import Mouse, Touch, Pointer
 from autopilot.platform import model
@@ -83,6 +84,27 @@
             "com.ubuntu.weather",
             emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
+    def launch_and_quit_app(self, database):
+        self.launch_app()
+        self.assertThat(
+            lambda: os.path.exists(database),
+            Eventually(Equals(True))
+        )
+
+        # When calling launch_app an instance of the spawned process
+        # control object will be stored in self.app.process, and a cleanup
+        # handler will be registered that essentially kills the process.
+        # Therefore, by triggering the cleanup handler here we're killing the
+        # process and removing the handler, which allows a clean launch of
+        # the process during regular test setup.
+        self.doCleanups()
+
+    def ensure_db(self):
+        path = os.path.expanduser("~/.local/share/com.ubuntu.weather/Databases")
+        db = os.path.join(path, md5.md5("com.ubuntu.weather").hexdigest() + ".sqlite")
+        if not os.path.exists(db):
+            self.launch_and_quit_app(db)
+
     def get_qml_view(self):
         return self.app.select_single("QQuickView")
 

=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_mainview.py'
--- tests/autopilot/ubuntu_weather_app/tests/test_mainview.py	2013-12-11 20:24:42 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/test_mainview.py	2013-12-17 14:44:53 +0000
@@ -27,10 +27,7 @@
     """ This is needed to wait for the application to start.
         In the testfarm, the application may take some time to show up."""
     def setUp(self):
-        #close app
-        #logger.debug("Closing app")
-        #self.doCleanups()
-        #wipe the existing database and create a new blank one
+        self.ensure_db()
         self.create_blank_db()
         # add settings to storage
         logger.debug("Adding fake data to new database")