Merge lp:~canonical-platform-qa/ubuntu-ui-toolkit/fix_keyboard_bug1523501 into lp:ubuntu-ui-toolkit/staging

[Brendan Donegan]

Only the OSK has the _keyboard attribute which we need for getting the info about it, so only try to use that if the keyboard is OSK

Only the OSK has the _keyboard attribute which we need for getting the info about it, so only try to use that if the keyboard is OSK

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1741
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2570/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1298
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1300/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1297

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2570/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_common.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_common.py	2015-09-22 15:56:35 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_common.py	2015-12-07 16:33:49 +0000
@@ -60,7 +60,7 @@
         restart_maliit_with_testability()
         return input.Keyboard.create('OSK')
     else:
-        return input.Keyboard.create()
+        return None
 
 
 def restart_maliit_with_testability():

=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py	2015-10-07 20:50:20 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py	2015-12-07 16:33:49 +0000
@@ -38,7 +38,7 @@
         container.globalRect.y + container.globalRect.height
         for container in containers if container.globalRect.height > 0]
     keyboard = _common.get_keyboard()
-    if keyboard._keyboard.is_available():
+    if keyboard and keyboard._keyboard.is_available():
         containers_bottom.append(keyboard._keyboard.keyboard.globalRect.y)
     return min(containers_bottom)