Merge lp:~om26er/ubuntu-calculator-app/fix_start_stop_OSK into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

[Omer Akram]

Improves the start/stop of OSK during autopilot test run. Handle a condition where interrupting the test run (ctrl+c) would result in not being able to run the test suite again.

Improves the start/stop of OSK during autopilot test run. Handle a condition where interrupting the test run (ctrl+c) would result in not being able to run the test suite again.

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

PASSED: Continuous integration, rev:169
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/117/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/564
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-precise-amd64-ci/116
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-quantal-amd64-ci/116
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/116
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/116

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

review: Approve (continuous-integration)

[Mihir Soni (mihirsoni)]

Looks good..:)

Thanks for your time

review: Approve

=== modified file 'tests/autopilot/ubuntu_calculator_app/tests/__init__.py'
--- tests/autopilot/ubuntu_calculator_app/tests/__init__.py	2013-09-27 16:31:05 +0000
+++ tests/autopilot/ubuntu_calculator_app/tests/__init__.py	2013-09-30 06:41:52 +0000
@@ -45,13 +45,6 @@
         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()
         elif os.path.exists(self.installed_location):
@@ -81,11 +74,25 @@
             emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
     def temp_move_sqlite_db(self):
-        if 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)))
+        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.
+            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:
+            pass
 
     def restore_sqlite_db(self):
         if os.path.exists(self.backup_dir) and os.path.exists(self.sqlite_dir):

=== modified file 'tests/autopilot/ubuntu_calculator_app/tests/test_simple_page.py'
--- tests/autopilot/ubuntu_calculator_app/tests/test_simple_page.py	2013-09-24 19:51:16 +0000
+++ tests/autopilot/ubuntu_calculator_app/tests/test_simple_page.py	2013-09-30 06:41:52 +0000
@@ -20,8 +20,10 @@
 
 from testtools.matchers import Equals
 from autopilot.matchers import Eventually
+from autopilot.platform import model
 
 from ubuntu_calculator_app.tests import CalculatorTestCase
+import subprocess
 
 
 class TestSimplePage(CalculatorTestCase):
@@ -29,6 +31,22 @@
     def setUp(self):
         super(TestSimplePage, self).setUp()
 
+    @classmethod
+    def setUpClass(cls):
+        if model() != "Desktop":
+            try:
+                subprocess.check_call(["stop", "-q", "maliit-server"])
+            except subprocess.CalledProcessError:
+                pass
+
+    @classmethod
+    def tearDownClass(cls):
+        if model() != "Desktop":
+            try:
+                subprocess.check_call(["start", "-q", "maliit-server"])
+            except subprocess.CalledProcessError:
+                pass
+
     def test_operation_after_clear(self):
         """ Test that after clearing one calculation, the next is still correct
         (bug #1164973).