Merge lp:~osomon/webbrowser-app/autopilot-fixes-desktop-narrow-mode into lp:webbrowser-app

[Olivier Tilloy]

Fix a couple of autopilot failures on desktop in narrow mode.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1238
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2367/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4685
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1121
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1121
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1121/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1121
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3780
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4682
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4682/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24297

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2367/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1238
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2369/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4692
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1123
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1123
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1123/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1123
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3785
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4689
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4689/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24310

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2369/rebuild

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/webbrowser_app/tests/test_keyboard.py'
--- tests/autopilot/webbrowser_app/tests/test_keyboard.py	2015-09-29 13:15:01 +0000
+++ tests/autopilot/webbrowser_app/tests/test_keyboard.py	2015-10-16 14:38:05 +0000
@@ -105,9 +105,15 @@
         self.main_window.press_key('Ctrl+Page_Down')
         self.check_tab_number(0)
         self.main_window.press_key('Shift+Ctrl+Tab')
-        self.check_tab_number(2)
+        if self.main_window.wide:
+            self.check_tab_number(2)
+        else:
+            self.check_tab_number(1)
         self.main_window.press_key('Ctrl+Page_Up')
-        self.check_tab_number(1)
+        if self.main_window.wide:
+            self.check_tab_number(1)
+        else:
+            self.check_tab_number(2)
 
     def test_can_switch_tabs_after_suggestions_escape(self):
         self.open_tabs(1)
@@ -308,7 +314,8 @@
         self.assertThat(address_bar.findInPageMode, Eventually(Equals(True)))
         self.main_window.press_key('Escape')
         self.assertThat(address_bar.findInPageMode, Eventually(Equals(False)))
-
+        if not self.main_window.wide:
+            self.open_tabs_view()
         self.open_new_tab()
         self.main_window.press_key('Ctrl+F')
         self.assertThat(address_bar.findInPageMode, Equals(False))