Merge lp:~jonas-drange/ubuntu-system-settings/fix-osk-dismiss into lp:ubuntu-system-settings

[Jonas G. Drange]

patch environment with required maliit variable whenever we use osk.dismiss()

[Ken VanDine (ken-vandine)]

thanks!

review: Approve

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

FAILED: Continuous integration, rev:1619
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/117/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/1244
    FAILURE: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/269/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1244
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/1116
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/1116
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/1116
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1103
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1103/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1103
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1103/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1103
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1103/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1103
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1103/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1103
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1103/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1103
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1103/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1103
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1103/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1103
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1103/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1103
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1103/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/117/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'tests/autopilot/ubuntu_system_settings/__init__.py'
--- tests/autopilot/ubuntu_system_settings/__init__.py	2016-08-18 14:04:02 +0000
+++ tests/autopilot/ubuntu_system_settings/__init__.py	2016-08-18 14:04:02 +0000
@@ -1952,6 +1952,7 @@
 
     @autopilot.logging.log_action(logger.debug)
     def set_openvpn_file(self, field, paths):
+        utils.dismiss_osk()
         self.get_root_instance().main_view.scroll_to_and_click(field)
 
         # Wait for expanded animation.
@@ -1960,6 +1961,7 @@
         # file = field.wait_select_single(objectName='vpnFileSelectorItem0')
         choose = field.wait_select_single(objectName='vpnFileSelectorItem1')
         self.pointing_device.click_object(choose)
+        self.get_root_instance().main_view.scroll_to_and_click(choose)
         file_dialog = self.get_root_instance().wait_select_single(
             objectName='vpnDialogFile'
         )

=== modified file 'tests/autopilot/ubuntu_system_settings/tests/__init__.py'
--- tests/autopilot/ubuntu_system_settings/tests/__init__.py	2016-08-18 14:04:02 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/__init__.py	2016-08-18 14:04:02 +0000
@@ -223,6 +223,9 @@
             inetwork, parameters=self.indicatornetwork_parameters,
             stdout=subprocess.PIPE)
 
+        # Required since this test needs to dismiss the OSK.
+        self.useFixture(EnvironmentVariable("UITK_USE_MALIIT", "1"))
+
         super(UbuntuSystemSettingsHotspotTestCase, self).setUp()
 
     def tearDown(self):
@@ -1112,6 +1115,8 @@
 
     def setUp(self):
         super(VpnBaseTestCase, self).setUp()
+        # Required since this test needs to dismiss the OSK.
+        self.useFixture(EnvironmentVariable("UITK_USE_MALIIT", "1"))
         self.vpn_page = self.main_view.go_to_vpn_page()
 
     def get_vpn_connection_object(self, path):
@@ -1163,6 +1168,9 @@
             security=NM80211ApSecurityFlags.NM_802_11_AP_SEC_KEY_MGMT_PSK
         )
 
+        # Required since this test needs to dismiss the OSK.
+        self.useFixture(EnvironmentVariable("UITK_USE_MALIIT", "1"))
+
         super(WifiBaseTestCase, self).setUp(panel)
         if panel:
             self.wifi_page = self.main_view.wait_select_single(