Merge lp:~jonas-drange/ubuntu-system-settings/wifi-hide-other-fix-1377076 into lp:ubuntu-system-settings

[Jonas G. Drange]

[wifi] use actiongroup to hide "connect to other networks"

[wifi] use actiongroup to hide "connect to other networks"

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1142
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1661/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6069
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4143
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/853
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5698
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7321
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7321/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14868
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3504
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4486
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4486/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1661/rebuild

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

Looks good, but the tests need to be fixed as well.

review: Needs Fixing

[Jonas G. Drange (jonas-drange)]

How do we fix this?

On Mon, Oct 20, 2014 at 8:36 PM, Ken VanDine <email address hidden>
wrote:

> Review: Needs Fixing
>
> Looks good, but the tests need to be fixed as well.
> --
>
> https://code.launchpad.net/~jonas-drange/ubuntu-system-settings/wifi-hide-other-fix-1377076/+merge/238922
> You are the owner of
> lp:~jonas-drange/ubuntu-system-settings/wifi-hide-other-fix-1377076.
>

[lp:~jonas-drange/ubuntu-system-settings/wifi-hide-other-fix-1377076]

1143. By Jonas G. Drange on 2014-10-21

merge trunk

1144. By Jonas G. Drange on 2014-10-21

making test work for unity7 and unity8.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1144
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1670/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6108
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4162
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/862
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5735
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7360
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7360/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14915
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3523
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4507
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4507/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1670/rebuild

review: Needs Fixing (continuous-integration)

[lp:~jonas-drange/ubuntu-system-settings/wifi-hide-other-fix-1377076]

1145. By Jonas G. Drange on 2014-10-22

translate wifi

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1145
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1671/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6128
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4167
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/863
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5758
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7380
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7380/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14951
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3528
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4512
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4512/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1671/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1145
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1680/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6164
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4183
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/872
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5790
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7416
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7416/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15001
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3543
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4536
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4536/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1680/rebuild

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

Great, thanks!

review: Approve

=== modified file 'plugins/wifi/PageComponent.qml'
--- plugins/wifi/PageComponent.qml	2014-09-26 12:52:31 +0000
+++ plugins/wifi/PageComponent.qml	2014-10-22 12:52:36 +0000
@@ -138,6 +138,8 @@
                 objectName: "connectToHiddenNetwork"
                 text: i18n.tr("Connect to hidden network…")
                 progression: true
+                visible : (actionGroup.actionObject.valid ?
+                           actionGroup.actionObject.state : false)
                 onClicked: {
                     otherNetworLoader.source = "OtherNetwork.qml";
                     PopupUtils.open(otherNetworLoader.item);
@@ -155,5 +157,4 @@
                             Flickable.DragAndOvershootBounds :
                             Flickable.StopAtBounds
     }
-
 }

=== modified file 'tests/autopilot/ubuntu_system_settings/__init__.py'
--- tests/autopilot/ubuntu_system_settings/__init__.py	2014-09-26 12:52:31 +0000
+++ tests/autopilot/ubuntu_system_settings/__init__.py	2014-10-22 12:52:36 +0000
@@ -678,6 +678,40 @@
                 return True
         return False
 
+    @autopilot.logging.log_action(logger.debug)
+    def enable_wireless(self):
+        self._set_wireless(True)
+
+    @autopilot.logging.log_action(logger.debug)
+    def disable_wireless(self):
+        self._set_wireless(False)
+
+    """
+    :returns: Whether or not WiFi can be used
+    """
+    @autopilot.logging.log_action(logger.debug)
+    def have_wireless(self):
+        try:
+            self.wait_select_single('SwitchMenuItem', text=_('Wi-Fi'))
+        except:
+            return False
+        return True
+
+    """Returns the current WiFi state
+
+    :returns: Whether or not WiFi is enabled
+    """
+    @autopilot.logging.log_action(logger.debug)
+    def get_wireless(self):
+        return self.wait_select_single(
+            'SwitchMenuItem', text=_('Wi-Fi')).checked
+
+    @autopilot.logging.log_action(logger.debug)
+    def _set_wireless(self, state):
+        obj = self.wait_select_single('SwitchMenuItem', text=_('Wi-Fi'))
+        if obj.checked != state:
+            self.pointing_device.click_object(obj)
+
     """Connects to hidden network
 
     :param name: Network name string (SSID)

=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_wifi.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_wifi.py	2014-09-26 12:52:31 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_wifi.py	2014-10-22 12:52:36 +0000
@@ -25,6 +25,11 @@
             Equals(_('Wi-Fi')))
 
     def test_connect_to_hidden_network(self):
+        if not self.wifi_page.have_wireless():
+            self.skipTest('Cannot test wireless since it cannot be enabled')
+        self.addCleanup(
+            self.wifi_page._set_wireless, self.wifi_page.get_wireless())
+        self.wifi_page.enable_wireless()
         dialog = self.wifi_page.connect_to_hidden_network(
             'yeah',
             scroll_to_and_click=self.system_settings.main_view
@@ -47,7 +52,11 @@
             dialog.wait_until_destroyed()
 
     def test_connect_to_nonexistant_hidden_network(self):
-
+        if not self.wifi_page.have_wireless():
+            self.skipTest('Cannot test wireless since it cannot be enabled')
+        self.addCleanup(
+            self.wifi_page._set_wireless, self.wifi_page.get_wireless())
+        self.wifi_page.enable_wireless()
         dialog = self.wifi_page.connect_to_hidden_network(
             'yeah',
             scroll_to_and_click=self.system_settings.main_view
@@ -72,6 +81,11 @@
 
     @skip('skipped due to bug 1337556')
     def test_connect_to_hidden_network_using_secrets(self):
+        if not self.wifi_page.have_wireless():
+            self.skipTest('Cannot test wireless since it cannot be enabled')
+        self.addCleanup(
+            self.wifi_page._set_wireless, self.wifi_page.get_wireless())
+        self.wifi_page.enable_wireless()
         dialog = self.wifi_page.connect_to_hidden_network(
             'yeah', security='wpa', password='abcdefgh',
             scroll_to_and_click=self.system_settings.main_view
@@ -95,6 +109,11 @@
 
     @skip('skipped due to bug 1337556')
     def test_connect_to_hidden_network_using_incorrect_secrets(self):
+        if not self.wifi_page.have_wireless():
+            self.skipTest('Cannot test wireless since it cannot be enabled')
+        self.addCleanup(
+            self.wifi_page._set_wireless, self.wifi_page.get_wireless())
+        self.wifi_page.enable_wireless()
         dialog = self.wifi_page.connect_to_hidden_network(
             'yeah', security='wpa', password='abcdefgh',
             scroll_to_and_click=self.system_settings.main_view
@@ -117,7 +136,11 @@
                 _('Your authentication details were incorrect'))))
 
     def test_connect_to_hidden_network_then_cancel(self):
-
+        if not self.wifi_page.have_wireless():
+            self.skipTest('Cannot test wireless since it cannot be enabled')
+        self.addCleanup(
+            self.wifi_page._set_wireless, self.wifi_page.get_wireless())
+        self.wifi_page.enable_wireless()
         dialog = self.wifi_page.connect_to_hidden_network(
             'foo',
             scroll_to_and_click=self.system_settings.main_view
@@ -134,6 +157,18 @@
                 len(self.device_mock.GetMethodCalls('Disconnect')),
             Eventually(Equals(1)))
 
+    def test_connect_to_hidden_network_dialog_visibility(self):
+        if not self.wifi_page.have_wireless():
+            self.skipTest('Cannot test wireless since it cannot be enabled')
+        self.addCleanup(
+            self.wifi_page._set_wireless, self.wifi_page.get_wireless())
+        self.wifi_page.disable_wireless()
+        self.assertThat(
+            lambda: bool(self.wifi_page.select_single(
+                '*',
+                objectName='connectToHiddenNetwork').visible),
+            Eventually(Equals(False)), 'other net dialog not hidden')
+
     """Note: this test does not actually remove previous networks from the UI.
     The NetworkManager dbusmock template does not currently support deletion
     of connections."""
@@ -157,5 +192,7 @@
 
         self.system_settings.main_view.go_back()
 
+        # wait for ui to update
+        sleep(2)
         self.wifi_page.remove_previous_network(
             previous_networks[2]['ssid'], scroll_to_and_click=click_method)