Merge lp:~nskaggs/ubuntu-calculator-app/fix-db-path into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

[Nicholas Skaggs]

update the hardcoded db path so autopilot tests can continue to work

Fix https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1234544, update the hardcoded db path so autopilot tests can continue to work

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

FAILED: Continuous integration, rev:173
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/119/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests/631/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calculator-app-precise-amd64-ci/118/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calculator-app-quantal-amd64-ci/118/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/118/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/118/console

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

review: Needs Fixing (continuous-integration)

[lp:~nskaggs/ubuntu-calculator-app/fix-db-path]

174. By Nicholas Skaggs on 2013-10-03

add logging needs

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

FAILED: Continuous integration, rev:174
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/120/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests/643/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calculator-app-precise-amd64-ci/119/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calculator-app-quantal-amd64-ci/119/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/119/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/119/console

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

review: Needs Fixing (continuous-integration)

[lp:~nskaggs/ubuntu-calculator-app/fix-db-path]

175. By Nicholas Skaggs on 2013-10-03

fix pyflakes errors

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

FAILED: Continuous integration, rev:175
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/121/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests/645/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-precise-amd64-ci/120
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-quantal-amd64-ci/120
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/120
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/120

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:175
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/122/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/649
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-precise-amd64-ci/121
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-quantal-amd64-ci/121
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/121
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/121

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

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

Thanks Nicholas, works great for me!

review: Approve

[Loïc Minier (lool)]

It would have been better not to hardcode the new DB pathname... Now these tests may only run with the updated SDK, not the "old" one which means they need to land together.

=== modified file 'tests/autopilot/ubuntu_calculator_app/tests/__init__.py'
--- tests/autopilot/ubuntu_calculator_app/tests/__init__.py	2013-09-30 06:39:24 +0000
+++ tests/autopilot/ubuntu_calculator_app/tests/__init__.py	2013-10-03 19:15:12 +0000
@@ -9,16 +9,17 @@
 
 import os
 import shutil
+import logging
 
 from autopilot.input import Mouse, Touch, Pointer
-from autopilot.matchers import Eventually
 from autopilot.platform import model
 from autopilot.testcase import AutopilotTestCase
-from testtools.matchers import Equals
 from ubuntuuitoolkit import emulators as toolkit_emulators
 
 from ubuntu_calculator_app import emulators
 
+logger = logging.getLogger(__name__)
+
 
 class CalculatorTestCase(AutopilotTestCase):
 
@@ -36,7 +37,7 @@
                          "ubuntu-calculator-app.qml"
 
     sqlite_dir = os.path.expanduser(
-        "~/.local/share/Qt Project/QtQmlViewer/QML/OfflineStorage/Databases")
+        "~/.local/share/ubuntu-calculator-app/Databases")
     backup_dir = sqlite_dir + ".backup"
 
     def setUp(self):
@@ -74,43 +75,33 @@
             emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
     def temp_move_sqlite_db(self):
-        if os.path.exists(self.sqlite_dir) and os.path.exists(self.backup_dir):
-            # In case the test suite was interrupted (ctrl+c) it may not run
-            # again because there is already a backup dir, so we make sure to
-            # delete it.
+        try:
             shutil.rmtree(self.backup_dir)
-            self.assertThat(
-                lambda: os.path.exists(self.backup_dir),
-                Eventually(Equals(False)))
-            shutil.move(self.sqlite_dir, self.backup_dir)
-            self.assertThat(
-                lambda: os.path.exists(self.backup_dir),
-                Eventually(Equals(True)))
-        elif os.path.exists(self.sqlite_dir):
-            shutil.move(self.sqlite_dir, self.backup_dir)
-            self.assertThat(
-                lambda: os.path.exists(self.backup_dir),
-                Eventually(Equals(True)))
-        else:
+        except:
             pass
+        else:
+            logger.warning("Prexisting backup database found and removed")
+
+        try:
+            shutil.move(self.sqlite_dir, self.backup_dir)
+        except:
+            logger.warning("No current database found")
+        else:
+            logger.debug("Backed up database")
 
     def restore_sqlite_db(self):
-        if os.path.exists(self.backup_dir) and os.path.exists(self.sqlite_dir):
-            shutil.rmtree(self.sqlite_dir)
-            self.assertThat(
-                lambda: os.path.exists(self.sqlite_dir),
-                Eventually(Equals(False)))
-            shutil.move(self.backup_dir, self.sqlite_dir)
-            self.assertTrue(
-                lambda: os.path.exists(self.sqlite_dir),
-                Eventually(Equals(True)))
-        elif os.path.exists(self.backup_dir):
-            shutil.move(self.backup_dir, self.sqlite_dir)
-            self.assertTrue(
-                lambda: os.path.exists(self.sqlite_dir),
-                Eventually(Equals(True)))
-        else:
-            pass
+        if os.path.exists(self.backup_dir):
+            if os.path.exists(self.sqlite_dir):
+                try:
+                    shutil.rmtree(self.sqlite_dir)
+                except:
+                    logger.error("Failed to remove test database and restore" /
+                                 "database")
+                    return
+            try:
+                shutil.move(self.backup_dir, self.sqlite_dir)
+            except:
+                logger.error("Failed to restore database")
 
     @property
     def main_view(self):