Merge lp:~nskaggs/ubuntu-clock-app/fix-1220998 into lp:ubuntu-clock-app/saucy

[Nicholas Skaggs]

Fix for OSK blocking UI elements during tests

Fix for OSK blocking UI elements during tests

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

PASSED: Continuous integration, rev:184
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/12/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/281
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-precise-amd64-ci/12
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-quantal-amd64-ci/12
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/12
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/12

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

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/ubuntu_clock_app/tests/__init__.py'
--- tests/autopilot/ubuntu_clock_app/tests/__init__.py	2013-09-05 01:58:21 +0000
+++ tests/autopilot/ubuntu_clock_app/tests/__init__.py	2013-09-06 01:45:20 +0000
@@ -51,9 +51,17 @@
     def setUp(self):
         self.pointing_device = Pointer(self.input_device_class.create())
         super(ClockAppTestCase, self).setUp()
+
+        #backup and wipe db's before testing
         self.temp_move_sqlite_db()
         self.addCleanup(self.restore_sqlite_db)
 
+        #turn off the OSK so it doesn't block screen elements
+        if model() != 'Desktop':
+            os.system("stop maliit-server")
+            #adding cleanup step seems to restart service immeadiately; disabling for now
+            #self.addCleanup(os.system("start maliit-server"))
+
         if os.path.exists(self.local_location):
             self.launch_test_local()
         else:
@@ -76,6 +84,8 @@
             emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
     def temp_move_sqlite_db(self):
+        if os.path.exists(self.backup_dir):
+            shutil.rmtree(self.backup_dir)
         if os.path.exists(self.sqlite_dir):
             shutil.move(self.sqlite_dir, self.backup_dir)
             self.assertThat(