Merge lp:~osomon/webbrowser-app/skip-keyboard-ap-tests-webcontainer-1611832 into lp:webbrowser-app

[Olivier Tilloy]

Skip webapp container autopilot tests that exercise keyboard shortcuts when not run on desktop.

[system-apps-ci-bot (system-apps-ci-bot)]

PASSED: Continuous integration, rev:1515
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/597/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/1171
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/243
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1171
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/1052
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/1052
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/1052
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1041
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1041/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1041
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1041/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1041
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1041/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1041
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1041/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1041
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1041/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1041
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1041/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1041
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1041/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1041
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1041/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1041
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1041/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/597/rebuild

review: Approve (continuous-integration)

[Alexandre Abreu (abreu-alexandre)]

review: Approve

=== modified file 'tests/autopilot/webapp_container/tests/test_chrome.py'
--- tests/autopilot/webapp_container/tests/test_chrome.py	2016-06-21 04:44:57 +0000
+++ tests/autopilot/webapp_container/tests/test_chrome.py	2016-08-10 16:10:00 +0000
@@ -1,5 +1,5 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2014-2015 Canonical
+# Copyright 2014-2016 Canonical
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -13,8 +13,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
+import testtools
+
 from testtools.matchers import Equals, GreaterThan
 from autopilot.matchers import Eventually
+from autopilot.platform import model
 
 from webapp_container.tests import WebappContainerTestCaseWithLocalContentBase
 
@@ -52,6 +55,7 @@
     def press_key(self, key):
         self.keyboard.press_and_release(key)
 
+    @testtools.skipIf(model() != "Desktop", "on desktop only")
     def test_shortcut_backforward(self):
         args = [""]
         self.launch_webcontainer_app_with_local_http_server(args)
@@ -72,6 +76,7 @@
         self.assertThat(lambda: self.get_oxide_webview().url,
                         Eventually(Equals(url2)))
 
+    @testtools.skipIf(model() != "Desktop", "on desktop only")
     def test_shortcut_reload(self):
         args = ['']
         self.launch_webcontainer_app_with_local_http_server(args)