Merge lp:~nskaggs/ubuntu-calculator-app/disable-osk-autopilot into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

Proposed by Nicholas Skaggs
Status: Merged
Approved by: Riccardo Padovani
Approved revision: 154
Merged at revision: 153
Proposed branch: lp:~nskaggs/ubuntu-calculator-app/disable-osk-autopilot
Merge into: lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk
Diff against target: 17 lines (+7/-0)
1 file modified
tests/autopilot/ubuntu_calculator_app/tests/__init__.py (+7/-0)
To merge this branch: bzr merge lp:~nskaggs/ubuntu-calculator-app/disable-osk-autopilot
Reviewer Review Type Date Requested Status
Riccardo Padovani Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+186042@code.launchpad.net

Commit message

Prevent autopilot tests from failing due to OSK bugs on actual devices by disabling OSK during runtime

Description of the change

Prevent autopilot tests from failing due to OSK bugs on actual devices by disabling OSK during runtime

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
154. By Nicholas Skaggs

make sure pyflakes and pep8 are happy :-)

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:154
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/96/
Executed test runs:

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Riccardo Padovani (rpadovani) wrote :

Thanks :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/autopilot/ubuntu_calculator_app/tests/__init__.py'
2--- tests/autopilot/ubuntu_calculator_app/tests/__init__.py 2013-08-23 17:28:52 +0000
3+++ tests/autopilot/ubuntu_calculator_app/tests/__init__.py 2013-09-17 14:24:48 +0000
4@@ -43,6 +43,13 @@
5 self.temp_move_sqlite_db()
6 self.addCleanup(self.restore_sqlite_db)
7
8+ #turn off the OSK so it doesn't block screen elements
9+ if model() != 'Desktop':
10+ os.system("stop maliit-server")
11+ #adding cleanup step seems to restart service immeadiately
12+ #disabling for now
13+ #self.addCleanup(os.system("start maliit-server"))
14+
15 if os.path.exists(self.local_location):
16 self.launch_test_local()
17 else:

Subscribers

People subscribed via source and target branches