Merge lp:~jonas-drange/ubuntu-system-settings/fix-networkmanager-tests into lp:ubuntu-system-settings

[Jonas G. Drange]

fix tests that uses the networkmanager template

Rationale:
The networkmanager template in python-dbusmock changed considerably from 0.13 to 0.14. E.g. Wi-Fi connections now require an access point to be added—in USS we added Wi-Fi connections without an access point.

Changed in this branch:
We now use the networkmanager template API to create access points for every Wi-Fi connection.

Also, since we're using a new API in the networkmanager template (AddAccessPoint), we need to depend on, at least, python-dbusmock 0.14.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1362
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2044/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2080
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/314
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1831
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2078
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2078/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19347

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

review: Needs Fixing (continuous-integration)

[Sebastien Bacher (seb128)]

thanks! (not sure why the background test failed in the CI log though)

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1362
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2045/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2091
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/315
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1842
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2089
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2089/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19363

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1362
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2046/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2094
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/316
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1844
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2092
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2092/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19367

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

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2015-03-04 06:42:32 +0000
+++ debian/control	2015-04-01 12:43:07 +0000
@@ -131,7 +131,7 @@
 Depends: ubuntu-system-settings,
          gir1.2-upowerglib-1.0,
          python3-autopilot,
-         python3-dbusmock (>= 0.10.1),
+         python3-dbusmock (>= 0.14),
          python3-dateutil,
          python3-evdev,
          libautopilot-qt,

=== modified file 'tests/autopilot/ubuntu_system_settings/tests/__init__.py'
--- tests/autopilot/ubuntu_system_settings/tests/__init__.py	2015-02-19 07:22:16 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/__init__.py	2015-04-01 12:43:07 +0000
@@ -27,7 +27,6 @@
 import ubuntuuitoolkit
 from autopilot import platform
 from autopilot.matchers import Eventually
-from dbusmock.templates.networkmanager import DEVICE_IFACE
 from fixtures import EnvironmentVariable
 from gi.repository import UPowerGlib
 from testtools.matchers import Equals, NotEquals, GreaterThan
@@ -869,45 +868,10 @@
 
     def setUp(self, panel=None):
         self.obj_nm.Reset()
-        device_path = self.obj_nm.AddWiFiDevice('test0', 'Barbaz', 1)
+        self.device_path = self.obj_nm.AddWiFiDevice('test0', 'Barbaz', 1)
         self.device_mock = dbus.Interface(self.dbus_con.get_object(
-            NM_SERVICE, device_path),
+            NM_SERVICE, self.device_path),
             dbusmock.MOCK_IFACE)
 
-        self.add_active_connection(
-            'activecon0', self.device_mock, device_path)
-
         super(WifiBaseTestCase, self).setUp()
         self.wifi_page = self.main_view.go_to_wifi_page()
-
-    def add_previous_networks(self, networks):
-        dev_path = str(self.obj_nm.GetDevices()[0])
-        for network in networks:
-            self.obj_nm.AddWiFiConnection(
-                dev_path, network['connection_name'],
-                network['ssid'], network.get('keymng', ''))
-
-    def add_active_connection(self, connection_name, device_mock, device_path):
-        """Add ActiveConnection object to device as well as the
-        Active.Connection object being referred to. Will add mocked
-        Connection object, active_connection_mock, to the test case."""
-
-        # Add a new Connection object
-        con_path = self.obj_nm.AddWiFiConnection(
-            device_path, connection_name, 'fake ssid', '')
-        self.active_connection_mock = dbus.Interface(self.dbus_con.get_object(
-            NM_SERVICE, con_path),
-            dbusmock.MOCK_IFACE)
-        # Set up the ActiveConnection object, which will have a
-        # Connection property pointing to the created Connection
-        ac_path = '/org/freedesktop/NetworkManager/ActiveConnection/%s' % (
-            connection_name)
-        self.dbusmock.AddObject(ac_path, NM_AC_CON_IFACE, {}, [])
-        ac_mock = dbus.Interface(self.dbus_con.get_object(
-            NM_SERVICE, ac_path),
-            dbusmock.MOCK_IFACE)
-        ac_mock.AddProperty(
-            NM_AC_CON_IFACE, 'Connection', dbus.ObjectPath(con_path))
-
-        device_mock.AddProperty(
-            DEVICE_IFACE, 'ActiveConnection', dbus.ObjectPath(ac_path))

=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_wifi.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_wifi.py	2015-01-21 14:50:27 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_wifi.py	2015-04-01 12:43:07 +0000
@@ -7,7 +7,9 @@
 
 from __future__ import absolute_import
 from autopilot.matchers import Eventually
-from dbusmock.templates.networkmanager import DEVICE_IFACE
+from dbusmock.templates.networkmanager import (DEVICE_IFACE,
+                                               InfrastructureMode,
+                                               NM80211ApSecurityFlags)
 from testtools.matchers import Equals
 from time import sleep
 from ubuntu_system_settings.tests import WifiBaseTestCase
@@ -168,30 +170,27 @@
                 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."""
     def test_remove_previous_network(self):
         click_method = self.main_view.scroll_to_and_click
-        previous_networks = [{
-            'ssid': 'Series of Tubes',
-            'connection_name': 'conn_0'
-        }, {
-            'ssid': 'Mi-Fi',
-            'connection_name': 'conn_1'
-        }, {
-            'ssid': 'dev/null',
-            'connection_name': 'conn_2'
-        }]
-
-        self.add_previous_networks(previous_networks)
+
+        access_points = ['Series of Tubes', 'dev/null', 'Mi-Fi',
+                         'MonkeySphere']
+
+        for idx, ap in enumerate(access_points):
+            self.dbusmock.AddAccessPoint(
+                self.device_path, 'Mock_AP%d' % idx, ap, '00:23:F8:7E:12:BB',
+                InfrastructureMode.NM_802_11_MODE_INFRA, 2425, 5400, 82,
+                NM80211ApSecurityFlags.NM_802_11_AP_SEC_KEY_MGMT_PSK)
+
+            self.dbusmock.AddWiFiConnection(
+                self.device_path, 'Mock_Con%d' % idx, ap, '')
 
         self.wifi_page.remove_previous_network(
-            previous_networks[0]['ssid'], scroll_to_and_click=click_method)
+            access_points[0], scroll_to_and_click=click_method)
 
         self.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)
+            access_points[2], scroll_to_and_click=click_method)