Merge lp:~pete-woods/indicator-network/try-and-make-unit-tests-more-reliable into lp:indicator-network

[Pete Woods]

Try and make the agent unit tests more reliable

Try and make the agent unit tests more reliable

[Antti Kaijanmäki (kaijanmaki)]

LGTM.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-08-26 09:18:27 +0000
+++ CMakeLists.txt	2016-09-29 18:11:03 +0000
@@ -11,6 +11,7 @@
 
 option(trace_messages "Print debug trace messages." ${TRACE_DEFAULT})
 option(REMOTE_BUILD "Remote build (skip docs, translations, tests)." FALSE)
+option(ENABLE_TESTS "Enable tests" TRUE)
 
 if(${trace_messages})
   add_definitions(-DINDICATOR_NETWORK_TRACE_MESSAGES)

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2016-08-26 09:18:27 +0000
+++ tests/CMakeLists.txt	2016-09-29 18:11:03 +0000
@@ -16,6 +16,10 @@
   ${TEST_DEPENDENCIES_INCLUDE_DIRS}
 )
 
+add_definitions(
+-DNETWORK_MANAGER_TEMPLATE_PATH="${CMAKE_CURRENT_SOURCE_DIR}/data/networkmanager.py"
+)
+
 add_subdirectory(integration)
 add_subdirectory(unit)
 add_subdirectory(utils)

=== added directory 'tests/data'
=== added file 'tests/data/networkmanager.py'
--- tests/data/networkmanager.py	1970-01-01 00:00:00 +0000
+++ tests/data/networkmanager.py	2016-09-29 18:11:03 +0000
@@ -0,0 +1,878 @@
+'''NetworkManager mock template
+
+This creates the expected methods and properties of the main
+org.freedesktop.NetworkManager object, but no devices. You can specify any
+property such as 'NetworkingEnabled', or 'WirelessEnabled' etc. in
+"parameters".
+'''
+
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation; either version 3 of the License, or (at your option) any
+# later version.  See http://www.gnu.org/copyleft/lgpl.html for the full text
+# of the license.
+
+__author__ = 'Iftikhar Ahmad'
+__email__ = '[e-mail]'
+__copyright__ = '(c) 2012 Canonical Ltd.'
+__license__ = 'LGPL 3+'
+
+import dbus
+import uuid
+import binascii
+
+from dbusmock import MOCK_IFACE
+import dbusmock
+
+
+BUS_NAME = 'org.freedesktop.NetworkManager'
+MAIN_OBJ = '/org/freedesktop/NetworkManager'
+MAIN_IFACE = 'org.freedesktop.NetworkManager'
+SETTINGS_OBJ = '/org/freedesktop/NetworkManager/Settings'
+SETTINGS_IFACE = 'org.freedesktop.NetworkManager.Settings'
+DEVICE_IFACE = 'org.freedesktop.NetworkManager.Device'
+WIRELESS_DEVICE_IFACE = 'org.freedesktop.NetworkManager.Device.Wireless'
+ACCESS_POINT_IFACE = 'org.freedesktop.NetworkManager.AccessPoint'
+CSETTINGS_IFACE = 'org.freedesktop.NetworkManager.Settings.Connection'
+ACTIVE_CONNECTION_IFACE = 'org.freedesktop.NetworkManager.Connection.Active'
+AGENT_MANAGER_OBJ = '/org/freedesktop/NetworkManager/AgentManager'
+AGENT_MANAGER_IFACE = 'org.freedesktop.NetworkManager.AgentManager'
+SYSTEM_BUS = True
+
+
+class NMState:
+    '''Global state
+
+    As per https://developer.gnome.org/NetworkManager/unstable/spec.html#type-NM_STATE
+    '''
+    NM_STATE_UNKNOWN = 0
+    NM_STATE_ASLEEP = 10
+    NM_STATE_DISCONNECTED = 20
+    NM_STATE_DISCONNECTING = 30
+    NM_STATE_CONNECTING = 40
+    NM_STATE_CONNECTED_LOCAL = 50
+    NM_STATE_CONNECTED_SITE = 60
+    NM_STATE_CONNECTED_GLOBAL = 70
+
+
+class NMConnectivityState:
+    '''Connectvity state
+
+    As per https://developer.gnome.org/NetworkManager/unstable/spec.html#type-NM_CONNECTIVITY
+    '''
+    NM_CONNECTIVITY_UNKNOWN = 0
+    NM_CONNECTIVITY_NONE = 1
+    NM_CONNECTIVITY_PORTAL = 2
+    NM_CONNECTIVITY_LIMITED = 3
+    NM_CONNECTIVITY_FULL = 4
+
+
+class NMActiveConnectionState:
+    '''Active connection state
+
+    As per https://developer.gnome.org/NetworkManager/unstable/spec.html#type-NM_ACTIVE_CONNECTION_STATE
+    '''
+    NM_ACTIVE_CONNECTION_STATE_UNKNOWN = 0
+    NM_ACTIVE_CONNECTION_STATE_ACTIVATING = 1
+    NM_ACTIVE_CONNECTION_STATE_ACTIVATED = 2
+    NM_ACTIVE_CONNECTION_STATE_DEACTIVATING = 3
+    NM_ACTIVE_CONNECTION_STATE_DEACTIVATED = 4
+
+
+class InfrastructureMode:
+    '''Infrastructure mode
+
+    As per https://developer.gnome.org/NetworkManager/unstable/spec.html#type-NM_802_11_MODE
+    '''
+    NM_802_11_MODE_UNKNOWN = 0
+    NM_802_11_MODE_ADHOC = 1
+    NM_802_11_MODE_INFRA = 2
+    NM_802_11_MODE_AP = 3
+
+    NAME_MAP = {
+        NM_802_11_MODE_UNKNOWN: 'unknown',
+        NM_802_11_MODE_ADHOC: 'adhoc',
+        NM_802_11_MODE_INFRA: 'infrastructure',
+        NM_802_11_MODE_AP: 'access-point',
+    }
+
+
+class DeviceState:
+    '''Device states
+
+    As per https://developer.gnome.org/NetworkManager/unstable/spec.html#type-NM_DEVICE_STATE
+    '''
+    UNKNOWN = 0
+    UNMANAGED = 10
+    UNAVAILABLE = 20
+    DISCONNECTED = 30
+    PREPARE = 40
+    CONFIG = 50
+    NEED_AUTH = 60
+    IP_CONFIG = 70
+    IP_CHECK = 80
+    SECONDARIES = 90
+    ACTIVATED = 100
+    DEACTIVATING = 110
+    FAILED = 120
+
+
+class NM80211ApSecurityFlags:
+    '''Security flags
+
+    As per https://developer.gnome.org/NetworkManager/unstable/spec.html#type-NM_802_11_AP_SEC
+    '''
+    NM_802_11_AP_SEC_NONE = 0x00000000
+    NM_802_11_AP_SEC_PAIR_WEP40 = 0x00000001
+    NM_802_11_AP_SEC_PAIR_WEP104 = 0x00000002
+    NM_802_11_AP_SEC_PAIR_TKIP = 0x00000004
+    NM_802_11_AP_SEC_PAIR_CCMP = 0x00000008
+    NM_802_11_AP_SEC_GROUP_WEP40 = 0x00000010
+    NM_802_11_AP_SEC_GROUP_WEP104 = 0x00000020
+    NM_802_11_AP_SEC_GROUP_TKIP = 0x00000040
+    NM_802_11_AP_SEC_GROUP_CCMP = 0x00000080
+    NM_802_11_AP_SEC_KEY_MGMT_PSK = 0x00000100
+    NM_802_11_AP_SEC_KEY_MGMT_802_1X = 0x00000200
+
+    NAME_MAP = {
+        NM_802_11_AP_SEC_KEY_MGMT_PSK: {
+            'key-mgmt': 'wpa-psk',
+            'auth-alg': 'open'
+        },
+    }
+
+
+class NM80211ApFlags:
+    '''Device flags
+
+    As per https://developer.gnome.org/NetworkManager/unstable/spec.html#type-NM_802_11_AP_FLAGS
+    '''
+    NM_802_11_AP_FLAGS_NONE = 0x00000000
+    NM_802_11_AP_FLAGS_PRIVACY = 0x00000001
+
+
+def activate_connection(self, conn, dev, ap):
+    # find a new name
+    count = 0
+    active_connections = dbusmock.get_object(MAIN_OBJ).Get(MAIN_IFACE, 'ActiveConnections')
+    while True:
+        path = dbus.ObjectPath('/org/freedesktop/NetworkManager/ActiveConnection/' + str(count))
+        if path not in active_connections:
+            break
+        count += 1
+
+    state = dbus.UInt32(NMActiveConnectionState.NM_ACTIVE_CONNECTION_STATE_ACTIVATED)
+    devices = []
+    if str(dev) != '/':
+        devices.append(dev)
+    active_conn = dbus.ObjectPath(AddActiveConnection(self, devices, conn, ap, str(count), state))
+
+    return active_conn
+
+
+def deactivate_connection(self, active_conn_path):
+    NM = dbusmock.get_object(MAIN_OBJ)
+
+    for dev_path in NM.GetDevices():
+        RemoveActiveConnection(self, dev_path, active_conn_path)
+
+
+def add_and_activate_connection(self, conn_conf, dev, ap):
+    name = ap.rsplit('/', 1)[1]
+    RemoveWifiConnection(self, dev, '/org/freedesktop/NetworkManager/Settings/' + name)
+
+    raw_ssid = ''.join([chr(byte) for byte in conn_conf["802-11-wireless"]["ssid"]])
+    wifi_conn = dbus.ObjectPath(AddWiFiConnection(self, dev, name, raw_ssid, ""))
+
+    active_conn = activate_connection(self, wifi_conn, dev, ap)
+
+    return (wifi_conn, active_conn)
+
+
+def load(mock, parameters):
+    mock.activate_connection = activate_connection
+    mock.deactivate_connection = deactivate_connection
+    mock.add_and_activate_connection = add_and_activate_connection
+    mock.AddMethods(MAIN_IFACE, [
+        ('GetDevices', '', 'ao',
+         'ret = [k for k in objects.keys() if "/Devices" in k]'),
+        ('GetPermissions', '', 'a{ss}', 'ret = {}'),
+        ('state', '', 'u', "ret = self.Get('%s', 'State')" % MAIN_IFACE),
+        ('CheckConnectivity', '', 'u', "ret = self.Get('%s', 'Connectivity')" % MAIN_IFACE),
+        ('ActivateConnection', 'ooo', 'o', "ret = self.activate_connection(self, args[0], args[1], args[2])"),
+        ('DeactivateConnection', 'o', '', "self.deactivate_connection(self, args[0])"),
+        ('AddAndActivateConnection', 'a{sa{sv}}oo', 'oo', "ret = self.add_and_activate_connection("
+                                     "self, args[0], args[1], args[2])"),
+    ])
+
+    mock.AddProperties('',
+                       {
+                           'ActiveConnections': dbus.Array([], signature='o'),
+                           'Devices': dbus.Array([], signature='o'),
+                           'NetworkingEnabled': parameters.get('NetworkingEnabled', True),
+                           'Connectivity': parameters.get('Connectivity', dbus.UInt32(NMConnectivityState.NM_CONNECTIVITY_FULL)),
+                           'State': parameters.get('State', dbus.UInt32(NMState.NM_STATE_CONNECTED_GLOBAL)),
+                           'Startup': False,
+                           'Version': parameters.get('Version', '0.9.6.0'),
+                           'WimaxEnabled': parameters.get('WimaxEnabled', True),
+                           'WimaxHardwareEnabled': parameters.get('WimaxHardwareEnabled', True),
+                           'WirelessEnabled': parameters.get('WirelessEnabled', True),
+                           'WirelessHardwareEnabled': parameters.get('WirelessHardwareEnabled', True),
+                           'WwanEnabled': parameters.get('WwanEnabled', False),
+                           'WwanHardwareEnabled': parameters.get('WwanHardwareEnabled', True)
+                       })
+
+    settings_props = {'Hostname': 'hostname',
+                      'CanModify': True,
+                      'Connections': dbus.Array([], signature='o')}
+    settings_methods = [('ListConnections', '', 'ao', "ret = self.Get('%s', 'Connections')" % SETTINGS_IFACE),
+                        ('GetConnectionByUuid', 's', 'o', ''),
+                        ('AddConnection', 'a{sa{sv}}', 'o', 'ret = self.SettingsAddConnection(args[0])'),
+                        ('SaveHostname', 's', '', '')]
+    mock.AddObject(SETTINGS_OBJ,
+                   SETTINGS_IFACE,
+                   settings_props,
+                   settings_methods)
+
+    agent_manager_methods = [('Register', 's', '', ''),
+                             ('RegisterWithCapabilities', 'su', '', ''),
+                             ('Unregister', '', '', '')]
+    mock.AddObject(AGENT_MANAGER_OBJ,
+                   AGENT_MANAGER_IFACE,
+                   {},
+                   agent_manager_methods)
+
+
[e-mail](MOCK_IFACE,
+                     in_signature='sssv', out_signature='')
+def SetProperty(self, path, iface, name, value):
+    obj = dbusmock.get_object(path)
+    obj.Set(iface, name, value)
+    obj.EmitSignal(iface, 'PropertiesChanged', 'a{sv}', [{name: value}])
+
+
[e-mail](MOCK_IFACE,
+                     in_signature='u', out_signature='')
+def SetGlobalConnectionState(self, state):
+    self.SetProperty(MAIN_OBJ, MAIN_IFACE, 'State', dbus.UInt32(state, variant_level=1))
+    self.EmitSignal(MAIN_IFACE, 'StateChanged', 'u', [state])
+
+
[e-mail](MOCK_IFACE,
+                     in_signature='u', out_signature='')
+def SetConnectivity(self, connectivity):
+    self.SetProperty(MAIN_OBJ, MAIN_IFACE, 'Connectivity', dbus.UInt32(connectivity, variant_level=1))
+
+
[e-mail](MOCK_IFACE,
+                     in_signature='ss', out_signature='')
+def SetDeviceActive(self, device_path, active_connection_path):
+    dev_obj = dbusmock.get_object(device_path)
+    dev_obj.Set(DEVICE_IFACE, 'ActiveConnection', dbus.ObjectPath(active_connection_path))
+    old_state = dev_obj.Get(DEVICE_IFACE, 'State')
+    dev_obj.Set(DEVICE_IFACE, 'State', dbus.UInt32(DeviceState.ACTIVATED))
+
+    dev_obj.EmitSignal(DEVICE_IFACE, 'StateChanged', 'uuu', [dbus.UInt32(DeviceState.ACTIVATED), old_state, dbus.UInt32(1)])
+
+
[e-mail](MOCK_IFACE,
+                     in_signature='s', out_signature='')
+def SetDeviceDisconnected(self, device_path):
+    dev_obj = dbusmock.get_object(device_path)
+    dev_obj.Set(DEVICE_IFACE, 'ActiveConnection', dbus.ObjectPath('/'))
+    old_state = dev_obj.Get(DEVICE_IFACE, 'State')
+    dev_obj.Set(DEVICE_IFACE, 'State', dbus.UInt32(DeviceState.DISCONNECTED))
+
+    dev_obj.EmitSignal(DEVICE_IFACE, 'StateChanged', 'uuu', [dbus.UInt32(DeviceState.DISCONNECTED), old_state, dbus.UInt32(1)])
+
+
[e-mail](MOCK_IFACE,
+                     in_signature='ssi', out_signature='s')
+def AddEthernetDevice(self, device_name, iface_name, state):
+    '''Add an ethernet device.
+
+    You have to specify device_name, device interface name (e. g. eth0), and
+    state. You can use the predefined DeviceState values (e. g.
+    DeviceState.ACTIVATED) or supply a numeric value. For valid state values
+    please visit
+    http://projects.gnome.org/NetworkManager/developers/api/09/spec.html#type-NM_DEVICE_STATE
+
+    Please note that this does not set any global properties.
+
+    Returns the new object path.
+    '''
+    path = '/org/freedesktop/NetworkManager/Devices/' + device_name
+    wired_props = {'Carrier': False,
+                   'HwAddress': dbus.String('78:DD:08:D2:3D:43'),
+                   'PermHwAddress': dbus.String('78:DD:08:D2:3D:43'),
+                   'Speed': dbus.UInt32(0)}
+    self.AddObject(path,
+                   'org.freedesktop.NetworkManager.Device.Wired',
+                   wired_props,
+                   [])
+
+    props = {'DeviceType': dbus.UInt32(1),
+             'State': dbus.UInt32(state),
+             'Interface': iface_name,
+             'ActiveConnection': dbus.ObjectPath('/'),
+             'AvailableConnections': dbus.Array([], signature='o'),
+             'AutoConnect': False,
+             'Managed': True,
+             'Driver': 'dbusmock',
+             'IpInterface': ''}
+
+    obj = dbusmock.get_object(path)
+    obj.AddProperties(DEVICE_IFACE, props)
+
+    devices = self.Get(MAIN_IFACE, 'Devices')
+    devices.append(path)
+    self.Set(MAIN_IFACE, 'Devices', devices)
+
+    self.EmitSignal('org.freedesktop.NetworkManager', 'DeviceAdded', 'o', [path])
+
+    return path
+
+
[e-mail](MOCK_IFACE,
+                     in_signature='ssi', out_signature='s')
+def AddWiFiDevice(self, device_name, iface_name, state):
+    '''Add a WiFi Device.
+
+    You have to specify device_name, device interface name (e. g.  wlan0) and
+    state. You can use the predefined DeviceState values (e. g.
+    DeviceState.ACTIVATED) or supply a numeric value. For valid state values,
+    please visit
+    http://projects.gnome.org/NetworkManager/developers/api/09/spec.html#type-NM_DEVICE_STATE
+
+    Please note that this does not set any global properties.
+
+    Returns the new object path.
+    '''
+
+    path = '/org/freedesktop/NetworkManager/Devices/' + device_name
+    self.AddObject(path,
+                   WIRELESS_DEVICE_IFACE,
+                   {
+                       'HwAddress': dbus.String('11:22:33:44:55:66'),
+                       'PermHwAddress': dbus.String('11:22:33:44:55:66'),
+                       'Bitrate': dbus.UInt32(5400),
+                       'Mode': dbus.UInt32(2),
+                       'WirelessCapabilities': dbus.UInt32(255),
+                       'AccessPoints': dbus.Array([], signature='o'),
+                   },
+                   [
+                       ('GetAccessPoints', '', 'ao',
+                        'ret = self.access_points'),
+                       ('GetAllAccessPoints', '', 'ao',
+                        'ret = self.access_points'),
+                       ('RequestScan', 'a{sv}', '', ''),
+                   ])
+
+    dev_obj = dbusmock.get_object(path)
+    dev_obj.access_points = []
+    dev_obj.AddProperties(DEVICE_IFACE,
+                          {
+                              'ActiveConnection': dbus.ObjectPath('/'),
+                              'AvailableConnections': dbus.Array([], signature='o'),
+                              'AutoConnect': False,
+                              'Managed': True,
+                              'Driver': 'dbusmock',
+                              'DeviceType': dbus.UInt32(2),
+                              'State': dbus.UInt32(state),
+                              'Interface': iface_name,
+                              'IpInterface': iface_name,
+                          })
+
+    devices = self.Get(MAIN_IFACE, 'Devices')
+    devices.append(path)
+    self.Set(MAIN_IFACE, 'Devices', devices)
+
+    self.EmitSignal('org.freedesktop.NetworkManager', 'DeviceAdded', 'o', [path])
+
+    return path
+
+
[e-mail](MOCK_IFACE,
+                     in_signature='ssssuuuyu', out_signature='s')
+def AddAccessPoint(self, dev_path, ap_name, ssid, hw_address,
+                   mode, frequency, rate, strength, security):
+    '''Add an access point to an existing WiFi device.
+
+    You have to specify WiFi Device path, Access Point object name,
+    ssid, hw_address, mode, frequency, rate, strength and security.
+    For valid access point property values, please visit
+    http://projects.gnome.org/NetworkManager/developers/api/09/spec.html#org.freedesktop.NetworkManager.AccessPoint
+
+    Please note that this does not set any global properties.
+
+    Returns the new object path.
+    '''
+    dev_obj = dbusmock.get_object(dev_path)
+    ap_path = '/org/freedesktop/NetworkManager/AccessPoint/' + ap_name
+    if ap_path in dev_obj.access_points:
+        raise dbus.exceptions.DBusException(
+            'Access point %s on device %s already exists' % (ap_name, dev_path),
+            name=MAIN_IFACE + '.AlreadyExists')
+
+    flags = NM80211ApFlags.NM_802_11_AP_FLAGS_PRIVACY
+    if security == NM80211ApSecurityFlags.NM_802_11_AP_SEC_NONE:
+        flags = NM80211ApFlags.NM_802_11_AP_FLAGS_NONE
+
+    self.AddObject(ap_path,
+                   ACCESS_POINT_IFACE,
+                   {'Ssid': dbus.ByteArray(ssid.encode('UTF-8')),
+                    'HwAddress': dbus.String(hw_address),
+                    'Flags': dbus.UInt32(flags),
+                    'LastSeen': dbus.Int32(1),
+                    'Frequency': dbus.UInt32(frequency),
+                    'MaxBitrate': dbus.UInt32(rate),
+                    'Mode': dbus.UInt32(mode),
+                    'RsnFlags': dbus.UInt32(security),
+                    'WpaFlags': dbus.UInt32(security),
+                    'Strength': dbus.Byte(strength)},
+                   [])
+
+    dev_obj.access_points.append(ap_path)
+
+    aps = dev_obj.Get(WIRELESS_DEVICE_IFACE, 'AccessPoints')
+    aps.append(ap_path)
+    dev_obj.Set(WIRELESS_DEVICE_IFACE, 'AccessPoints', aps)
+
+    dev_obj.EmitSignal(WIRELESS_DEVICE_IFACE, 'AccessPointAdded', 'o', [ap_path])
+
+    return ap_path
+
+
[e-mail](MOCK_IFACE,
+                     in_signature='ssss', out_signature='s')
+def AddWiFiConnection(self, dev_path, connection_name, ssid_name, key_mgmt):
+    '''Add an available connection to an existing WiFi device and access point.
+
+    You have to specify WiFi Device path, Connection object name,
+    SSID and key management.
+
+    The SSID must match one of the previously created access points.
+
+    Please note that this does not set any global properties.
+
+    Returns the new object path.
+    '''
+
+    dev_obj = dbusmock.get_object(dev_path)
+    connection_path = '/org/freedesktop/NetworkManager/Settings/' + connection_name
+    connections = dev_obj.Get(DEVICE_IFACE, 'AvailableConnections')
+
+    settings_obj = dbusmock.get_object(SETTINGS_OBJ)
+    main_connections = settings_obj.ListConnections()
+
+    ssid = ssid_name.encode('UTF-8')
+
+    # Find the access point by ssid
+    access_point = None
+    access_points = dev_obj.access_points
+    for ap_path in access_points:
+        ap = dbusmock.get_object(ap_path)
+        if ap.Get(ACCESS_POINT_IFACE, 'Ssid') == ssid:
+            access_point = ap
+            break
+
+    if not access_point:
+        raise dbus.exceptions.DBusException(
+            'Access point with SSID [%s] could not be found' % (ssid_name),
+            name=MAIN_IFACE + '.DoesNotExist')
+
+    hw_address = access_point.Get(ACCESS_POINT_IFACE, 'HwAddress')
+    mode = access_point.Get(ACCESS_POINT_IFACE, 'Mode')
+    security = access_point.Get(ACCESS_POINT_IFACE, 'WpaFlags')
+
+    if connection_path in connections or connection_path in main_connections:
+        raise dbus.exceptions.DBusException(
+            'Connection %s on device %s already exists' % (connection_name, dev_path),
+            name=MAIN_IFACE + '.AlreadyExists')
+
+    # Parse mac address string into byte array
+    mac_bytes = binascii.unhexlify(hw_address.replace(':', ''))
+
+    settings = {
+        '802-11-wireless': {
+            'seen-bssids': [hw_address],
+            'ssid': dbus.ByteArray(ssid),
+            'mac-address': dbus.ByteArray(mac_bytes),
+            'mode': InfrastructureMode.NAME_MAP[mode]
+        },
+        'connection': {
+            'timestamp': dbus.UInt64(1374828522),
+            'type': '802-11-wireless',
+            'id': ssid_name,
+            'uuid': str(uuid.uuid4())
+        },
+    }
+
+    if security != NM80211ApSecurityFlags.NM_802_11_AP_SEC_NONE:
+        settings['802-11-wireless']['security'] = '802-11-wireless-security'
+        settings['802-11-wireless-security'] = NM80211ApSecurityFlags.NAME_MAP[security]
+
+    self.AddObject(connection_path,
+                   CSETTINGS_IFACE,
+                   {
+                       'Unsaved': False
+                   },
+                   [
+                       ('Delete', '', '', 'self.ConnectionDelete(self)'),
+                       ('GetSettings', '', 'a{sa{sv}}', 'ret = self.ConnectionGetSettings(self)'),
+                       ('GetSecrets', 's', 'a{sa{sv}}', 'ret = self.ConnectionGetSecrets(self, args[0])'),
+                       ('Update', 'a{sa{sv}}', '', 'self.ConnectionUpdate(self, args[0])'),
+                   ])
+
+    connection_obj = dbusmock.get_object(connection_path)
+    connection_obj.settings = settings
+    connection_obj.connection_path = connection_path
+    connection_obj.ConnectionDelete = ConnectionDelete
+    connection_obj.ConnectionGetSettings = ConnectionGetSettings
+    connection_obj.ConnectionGetSecrets = ConnectionGetSecrets
+    connection_obj.ConnectionUpdate = ConnectionUpdate
+
+    connections.append(dbus.ObjectPath(connection_path))
+    dev_obj.Set(DEVICE_IFACE, 'AvailableConnections', connections)
+
+    main_connections.append(connection_path)
+    settings_obj.Set(SETTINGS_IFACE, 'Connections', main_connections)
+
+    settings_obj.EmitSignal(SETTINGS_IFACE, 'NewConnection', 'o', [ap_path])
+
+    return connection_path
+
+
[e-mail](MOCK_IFACE,
+                     in_signature='assssu', out_signature='s')
+def AddActiveConnection(self, devices, connection_device, specific_object, name, state):
+    '''Add an active connection to an existing WiFi device.
+
+    You have to a list of the involved WiFi devices, the connection path,
+    the access point path, ActiveConnection object name and connection
+    state.
+
+    Please note that this does not set any global properties.
+
+    Returns the new object path.
+    '''
+
+    conn_obj = dbusmock.get_object(connection_device)
+    settings = conn_obj.settings
+    conn_uuid = settings['connection']['uuid']
+    conn_type = settings['connection']['type']
+
+    device_objects = [dbus.ObjectPath(dev) for dev in devices]
+
+    active_connection_path = '/org/freedesktop/NetworkManager/ActiveConnection/' + name
+    self.AddObject(active_connection_path,
+                   ACTIVE_CONNECTION_IFACE,
+                   {
+                       'Devices': device_objects,
+                       'Default6': False,
+                       'Default': True,
+                       'Type': conn_type,
+                       'Vpn': (conn_type == 'vpn'),
+                       'Connection': dbus.ObjectPath(connection_device),
+                       'Master': dbus.ObjectPath('/'),
+                       'SpecificObject': dbus.ObjectPath(specific_object),
+                       'Uuid': conn_uuid,
+                       'State': state,
+                   },
+                   [])
+
+    for dev_path in devices:
+        self.SetDeviceActive(dev_path, active_connection_path)
+
+    active_connections = self.Get(MAIN_IFACE, 'ActiveConnections')
+    active_connections.append(dbus.ObjectPath(active_connection_path))
+    self.SetProperty(MAIN_OBJ, MAIN_IFACE, 'ActiveConnections', active_connections)
+
+    return active_connection_path
+
+
[e-mail](MOCK_IFACE,
+                     in_signature='ss', out_signature='')
+def RemoveAccessPoint(self, dev_path, ap_path):
+    '''Remove the specified access point.
+
+    You have to specify the device to remove the access point from, and the
+    path of the access point.
+
+    Please note that this does not set any global properties.
+    '''
+
+    dev_obj = dbusmock.get_object(dev_path)
+
+    aps = dev_obj.Get(WIRELESS_DEVICE_IFACE, 'AccessPoints')
+    aps.remove(ap_path)
+    dev_obj.Set(WIRELESS_DEVICE_IFACE, 'AccessPoints', aps)
+
+    dev_obj.access_points.remove(ap_path)
+
+    dev_obj.EmitSignal(WIRELESS_DEVICE_IFACE, 'AccessPointRemoved', 'o', [ap_path])
+
+    self.RemoveObject(ap_path)
+
+
[e-mail](MOCK_IFACE,
+                     in_signature='ss', out_signature='')
+def RemoveWifiConnection(self, dev_path, connection_path):
+    '''Remove the specified WiFi connection.
+
+    You have to specify the device to remove the connection from, and the
+    path of the Connection.
+
+    Please note that this does not set any global properties.
+    '''
+
+    dev_obj = dbusmock.get_object(dev_path)
+    settings_obj = dbusmock.get_object(SETTINGS_OBJ)
+
+    connections = dev_obj.Get(DEVICE_IFACE, 'AvailableConnections')
+    main_connections = settings_obj.ListConnections()
+
+    if connection_path not in connections and connection_path not in main_connections:
+        return
+
+    connections.remove(dbus.ObjectPath(connection_path))
+    dev_obj.Set(DEVICE_IFACE, 'AvailableConnections', connections)
+
+    main_connections.remove(connection_path)
+    settings_obj.Set(SETTINGS_IFACE, 'Connections', main_connections)
+
+    settings_obj.EmitSignal(SETTINGS_IFACE, 'ConnectionRemoved', 'o', [connection_path])
+
+    connection_obj = dbusmock.get_object(connection_path)
+    connection_obj.EmitSignal(CSETTINGS_IFACE, 'Removed', '', [])
+
+    self.RemoveObject(connection_path)
+
+
[e-mail](MOCK_IFACE,
+                     in_signature='ss', out_signature='')
+def RemoveActiveConnection(self, dev_path, active_connection_path):
+    '''Remove the specified ActiveConnection.
+
+    You have to specify the device to remove the connection from, and the
+    path of the ActiveConnection.
+
+    Please note that this does not set any global properties.
+    '''
+    self.SetDeviceDisconnected(dev_path)
+
+    active_connections = self.Get(MAIN_IFACE, 'ActiveConnections')
+
+    if active_connection_path not in active_connections:
+        return
+
+    active_connections.remove(dbus.ObjectPath(active_connection_path))
+    self.SetProperty(MAIN_OBJ, MAIN_IFACE, 'ActiveConnections', active_connections)
+
+    self.RemoveObject(active_connection_path)
+
+
[e-mail](SETTINGS_IFACE,
+                     in_signature='a{sa{sv}}', out_signature='o')
+def SettingsAddConnection(self, connection_settings):
+    '''Add a connection.
+
+    connection_settings is a String String Variant Map Map. See
+    https://developer.gnome.org/NetworkManager/0.9/spec.html
+        #type-String_String_Variant_Map_Map
+
+    If you omit uuid, this method adds one for you.
+    '''
+
+    if 'uuid' not in connection_settings['connection']:
+        connection_settings['connection']['uuid'] = str(uuid.uuid4())
+
+    NM = dbusmock.get_object(MAIN_OBJ)
+    settings_obj = dbusmock.get_object(SETTINGS_OBJ)
+    main_connections = settings_obj.ListConnections()
+
+    # Mimic how NM names connections
+    count = 0
+    while True:
+        connection_obj_path = dbus.ObjectPath(SETTINGS_OBJ + '/' + str(count))
+        if connection_obj_path not in main_connections:
+            break
+        count += 1
+    connection_path = str(connection_obj_path)
+
+    self.AddObject(connection_path,
+                   CSETTINGS_IFACE,
+                   {
+                       'Unsaved': False
+                   },
+                   [
+                       ('Delete', '', '', 'self.ConnectionDelete(self)'),
+                       ('GetSettings', '', 'a{sa{sv}}', 'ret = self.ConnectionGetSettings(self)'),
+                       ('GetSecrets', 's', 'a{sa{sv}}', 'ret = self.ConnectionGetSecrets(self, args[0])'),
+                       ('Update', 'a{sa{sv}}', '', 'self.ConnectionUpdate(self, args[0])'),
+                   ])
+
+    connection_obj = dbusmock.get_object(connection_path)
+    connection_obj.settings = connection_settings
+    connection_obj.connection_path = connection_path
+    connection_obj.ConnectionDelete = ConnectionDelete
+    connection_obj.ConnectionGetSettings = ConnectionGetSettings
+    connection_obj.ConnectionGetSecrets = ConnectionGetSecrets
+    connection_obj.ConnectionUpdate = ConnectionUpdate
+
+    main_connections.append(connection_path)
+    settings_obj.Set(SETTINGS_IFACE, 'Connections', main_connections)
+
+    settings_obj.EmitSignal(SETTINGS_IFACE, 'NewConnection', 'o', [connection_path])
+
+    auto_connect = False
+    if 'autoconnect' in connection_settings['connection']:
+        auto_connect = connection_settings['connection']['autoconnect']
+
+    if auto_connect:
+        dev = None
+        devices = NM.GetDevices()
+
+        # Grab the first device.
+        if len(devices) > 0:
+            dev = devices[0]
+
+        if dev:
+            activate_connection(NM, connection_path, dev, connection_path)
+
+    return connection_path
+
+
+def ConnectionUpdate(self, settings):
+    '''Update settings on a connection.
+
+    settings is a String String Variant Map Map. See
+    https://developer.gnome.org/NetworkManager/0.9/spec.html
+        #type-String_String_Variant_Map_Map
+    '''
+    connection_path = self.connection_path
+
+    NM = dbusmock.get_object(MAIN_OBJ)
+    settings_obj = dbusmock.get_object(SETTINGS_OBJ)
+
+    main_connections = settings_obj.ListConnections()
+
+    if connection_path not in main_connections:
+        raise dbus.exceptions.DBusException(
+            'Connection %s does not exist' % connection_path,
+            name=MAIN_IFACE + '.DoesNotExist',)
+
+    # Take care not to overwrite the secrets
+    for setting_name in settings:
+        setting = settings[setting_name]
+        for k in setting:
+            if setting_name not in self.settings:
+                self.settings[setting_name] = {}
+            self.settings[setting_name][k] = setting[k]
+
+    self.EmitSignal(CSETTINGS_IFACE, 'Updated', '', [])
+
+    auto_connect = False
+    if 'autoconnect' in settings['connection']:
+        auto_connect = settings['connection']['autoconnect']
+
+    if auto_connect:
+        dev = None
+        devices = NM.GetDevices()
+
+        # Grab the first device.
+        if len(devices) > 0:
+            dev = devices[0]
+
+        if dev:
+            activate_connection(NM, connection_path, dev, connection_path)
+
+    return connection_path
+
+
+def ConnectionGetSettings(self):
+    # Deep copy the settings with the secrets stripped
+    # out. (NOTE: copy.deepcopy doesn't work with dbus
+    # types).
+    settings = {}
+    for setting_name in self.settings:
+        setting = self.settings[setting_name]
+        for k in setting:
+            if k != 'secrets':
+                if setting_name not in settings:
+                    settings[setting_name] = {}
+                settings[setting_name][k] = setting[k]
+
+    return settings
+
+
+def ConnectionGetSecrets(self, setting):
+    settings = self.settings[setting]
+
+    if 'secrets' in settings:
+        secrets = {setting: {'secrets': settings['secrets']}}
+    else:
+        secrets = {setting: {'secrets': {'no-secrets': True}}}
+
+    return secrets
+
+
+def ConnectionDelete(self):
+    '''Deletes a connection.
+
+    This also
+        * removes the deleted connection from any device,
+        * removes any active connection(s) it might be associated with,
+        * removes it from the Settings interface,
+        * as well as deletes the object from the mock.
+
+    Note: If this was the only active connection, we change the global
+    connection state.
+    '''
+    connection_path = self.connection_path
+
+    NM = dbusmock.get_object(MAIN_OBJ)
+    settings_obj = dbusmock.get_object(SETTINGS_OBJ)
+
+    # Find the associated active connection(s).
+    active_connections = NM.Get(MAIN_IFACE, 'ActiveConnections')
+    associated_active_connections = []
+    for ac in active_connections:
+        ac_obj = dbusmock.get_object(ac)
+        ac_con = ac_obj.Get(ACTIVE_CONNECTION_IFACE, 'Connection')
+        if ac_con == connection_path:
+            associated_active_connections.append(ac)
+
+    # We found that the connection we are deleting are associated to all
+    # active connections and subsequently set the global state to
+    # disconnected.
+    if len(active_connections) == len(associated_active_connections):
+        self.SetGlobalConnectionState(NMState.NM_STATE_DISCONNECTED)
+
+    # Remove the connection from all associated devices.
+    # We also remove all associated active connections.
+    for dev_path in NM.GetDevices():
+        dev_obj = dbusmock.get_object(dev_path)
+        connections = dev_obj.Get(DEVICE_IFACE, 'AvailableConnections')
+
+        for ac in associated_active_connections:
+            NM.RemoveActiveConnection(dev_path, ac)
+
+        if connection_path not in connections:
+            continue
+
+        connections.remove(dbus.ObjectPath(connection_path))
+        dev_obj.Set(DEVICE_IFACE, 'AvailableConnections', connections)
+
+    # Remove the connection from the settings interface
+    main_connections = settings_obj.ListConnections()
+    if connection_path not in main_connections:
+        return
+    main_connections.remove(connection_path)
+    settings_obj.Set(SETTINGS_IFACE, 'Connections', main_connections)
+    settings_obj.EmitSignal(SETTINGS_IFACE, 'ConnectionRemoved', 'o', [connection_path])
+
+    # Remove the connection from the mock
+    connection_obj = dbusmock.get_object(connection_path)
+    connection_obj.EmitSignal(CSETTINGS_IFACE, 'Removed', '', [])
+    self.RemoveObject(connection_path)

=== modified file 'tests/integration/indicator-network-test-base.cpp'
--- tests/integration/indicator-network-test-base.cpp	2016-06-06 11:57:38 +0000
+++ tests/integration/indicator-network-test-base.cpp	2016-09-29 18:11:03 +0000
@@ -66,7 +66,8 @@
                                 QStringList{"-y", testDir.filePath(QString("%1-%2").arg(test_info->name(), "system.log"))})));
     }
 
-    dbusMock.registerNetworkManager();
+    qDebug() << NETWORK_MANAGER_TEMPLATE_PATH;
+    dbusMock.registerTemplate(NM_DBUS_SERVICE, NETWORK_MANAGER_TEMPLATE_PATH, {}, QDBusConnection::SystemBus);
     dbusMock.registerNotificationDaemon();
     // By default the ofono mock starts with one modem
     dbusMock.registerOfono({{"no_modem", true}});

=== modified file 'tests/unit/secret-agent/test-secret-agent.cpp'
--- tests/unit/secret-agent/test-secret-agent.cpp	2016-05-26 16:58:15 +0000
+++ tests/unit/secret-agent/test-secret-agent.cpp	2016-09-29 18:11:03 +0000
@@ -46,7 +46,7 @@
 		DBusTypes::registerMetaTypes();
 
 		dbusMock.registerNotificationDaemon();
-		dbusMock.registerNetworkManager();
+		dbusMock.registerTemplate(NM_DBUS_SERVICE, NETWORK_MANAGER_TEMPLATE_PATH, {}, QDBusConnection::SystemBus);
 		dbusTestRunner.startServices();
 
 		QProcessEnvironment env(QProcessEnvironment::systemEnvironment());
@@ -171,17 +171,20 @@
 
 	QSignalSpy notificationSpy(notificationsInterface.data(),
 	SIGNAL(MethodCalled(const QString &, const QVariantList &)));
-	notificationSpy.wait();
+	if (notificationSpy.empty())
+	{
+		ASSERT_TRUE(notificationSpy.wait());
+	}
 
 	ASSERT_EQ(1, notificationSpy.size());
 	const QVariantList &call(notificationSpy.at(0));
-	ASSERT_EQ("Notify", call.at(0));
+	EXPECT_EQ("Notify", call.at(0).toString().toStdString());
 
 	QVariantList args(call.at(1).toList());
 	transform(args);
 
 	ASSERT_EQ(8, args.size());
-	EXPECT_EQ("indicator-network", args.at(0));
+	EXPECT_EQ("indicator-network", args.at(0).toString().toStdString());
 	EXPECT_EQ("Connect to “the ssid”", args.at(3).toString().toStdString());
 
 	QVariantMap hints(args.at(6).toMap());
@@ -215,7 +218,7 @@
 		shared_ptr<GSimpleAction> o(g_simple_action_new("a", NULL), &mh::g_object_deleter);
 		mh::waitForCore(G_OBJECT(o.get()), "activate", 100);
 
-		ASSERT_EQ("Password received", secretAgent.readAll().trimmed());
+		EXPECT_EQ("Password received", secretAgent.readAll().trimmed().toStdString());
 	}
 
 	notificationsInterface->EmitSignal(
@@ -281,18 +284,21 @@
 
 	ASSERT_EQ(1, notificationSpy.size());
 	const QVariantList &call(notificationSpy.at(0));
-	ASSERT_EQ("Notify", call.at(0));
+	EXPECT_EQ("Notify", call.at(0).toString().toStdString());
 
 	notificationSpy.clear();
 
 	agentInterface->CancelGetSecrets(QDBusObjectPath("/connection/foo"),
 			SecretAgent::NM_WIRELESS_SECURITY_SETTING_NAME);
 
-	notificationSpy.wait();
+	if (notificationSpy.empty())
+	{
+		ASSERT_TRUE(notificationSpy.wait());
+	}
 
 	ASSERT_EQ(1, notificationSpy.size());
 	const QVariantList &closecall(notificationSpy.at(0));
-	ASSERT_EQ("CloseNotification", closecall.at(0));
+	EXPECT_EQ("CloseNotification", closecall.at(0).toString().toStdString());
 }
 
 /* Ensures that if we request secrets twice we close the notification
@@ -306,11 +312,14 @@
 			SecretAgent::NM_WIRELESS_SECURITY_SETTING_NAME, QStringList(),
 			5);
 
-	notificationSpy.wait();
+	if (notificationSpy.empty())
+	{
+		ASSERT_TRUE(notificationSpy.wait());
+	}
 
 	ASSERT_EQ(1, notificationSpy.size());
 	const QVariantList &call(notificationSpy.at(0));
-	ASSERT_EQ("Notify", call.at(0));
+	EXPECT_EQ("Notify", call.at(0).toString().toStdString());
 
 	notificationSpy.clear();
 
@@ -320,15 +329,21 @@
 			SecretAgent::NM_WIRELESS_SECURITY_SETTING_NAME, QStringList(),
 			5);
 
-	notificationSpy.wait();
-	notificationSpy.wait();
+	if (notificationSpy.empty())
+	{
+		ASSERT_TRUE(notificationSpy.wait());
+	}
+	if (notificationSpy.size() == 1)
+	{
+		ASSERT_TRUE(notificationSpy.wait());
+	}
 
 	ASSERT_EQ(2, notificationSpy.size());
 	const QVariantList &closecall(notificationSpy.at(1));
-	ASSERT_EQ("CloseNotification", closecall.at(0));
+	EXPECT_EQ("CloseNotification", closecall.at(0).toString().toStdString());
 
 	const QVariantList &newnotify(notificationSpy.at(0));
-	ASSERT_EQ("Notify", newnotify.at(0));
+	EXPECT_EQ("Notify", newnotify.at(0).toString().toStdString());
 }
 
 TEST_F(TestSecretAgent, SaveSecrets) {