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

[Jonas G. Drange]

[wifi] skip some tests that cannot be mocked and use specific object when found during connection

* Let the wifi dbus helper use a specific object (access point) if one is found.
* Skip tests that depends on mock not currently in python-dbusmock (with comments)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1382
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2103/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2843
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/373
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2435
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2841
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2841/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20534

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

review: Needs Fixing (continuous-integration)

[Sebastien Bacher (seb128)]

Thanks, if those are not currently ignored does it mean they are failing? Note that the CI run hit a "autopilot.exceptions.StateNotFoundError: Object not found with name '*' and properties {'objectName': 'otherNetworkDialog'}.", is that a real issue or a transient one?

review: Needs Information

[lp:~jonas-drange/ubuntu-system-settings/fix-1441192]

1383. By Jonas G. Drange on 2015-05-21

merge trunk

1384. By Jonas G. Drange on 2015-05-28

merge trunk

1385. By Jonas G. Drange on 2015-05-28

be specific when it comes to not found exceptions

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1385
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2128/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3005
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/398
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2560
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3003
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3003/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20820

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1385
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2129/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3009
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/399
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2563
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3007
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3007/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20826

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1385
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2131/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3016
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/401
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2567
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3014
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3014/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20837

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1385
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2143/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/80/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-amd64-ci/4/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-i386-ci/4
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/80/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1385
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2144/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/81
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-amd64-ci/5/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-i386-ci/5
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/59
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/81
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/81/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21019

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

review: Needs Fixing (continuous-integration)

[lp:~jonas-drange/ubuntu-system-settings/fix-1441192]

1386. By Jonas G. Drange on 2015-06-09

merge trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1385
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2150/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/88
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-i386-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/66
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/88
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/88/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21039

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1386
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2151/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/89
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-i386-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/67
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/89
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/89/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21045

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

review: Approve (continuous-integration)

[Jonas G. Drange (jonas-drange)]

There was a problem with the test, at the time of your comment seb, but the last failures I believe were transient ones with the root cause being the CI itself.

Thanks

[Sebastien Bacher (seb128)]

k, seems fine to me, thanks

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1386
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2155/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/144
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-i386-ci/16
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/94
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/144
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/144/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21362

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1386
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2158/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/148
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-amd64-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-i386-ci/19
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/98
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/148
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/148/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21370

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1386
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2159/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/149
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-i386-ci/20
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/99
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/149
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/149/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21380

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1387
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2162/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/173/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-amd64-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-i386-ci/23
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/116/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/173
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/173/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21421

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1387
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2163/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/174
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-amd64-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-i386-ci/24
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/117
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/174
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/174/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21423

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1387
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2164/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/184
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-i386-ci/25
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/123
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/184
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/184/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21444

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

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/wifi/wifidbushelper.cpp'
--- plugins/wifi/wifidbushelper.cpp	2014-10-10 14:10:52 +0000
+++ plugins/wifi/wifidbushelper.cpp	2015-06-25 12:53:56 +0000
@@ -31,7 +31,9 @@
 
 #define NM_SERVICE "org.freedesktop.NetworkManager"
 #define NM_PATH "/org/freedesktop/NetworkManager"
+#define NM_AP_IFACE "org.freedesktop.NetworkManager.AccessPoint"
 #define NM_DEVICE_IFACE "org.freedesktop.NetworkManager.Device"
+#define NM_DEVICE_WIRELESS_IFACE "org.freedesktop.NetworkManager.Device.Wireless"
 #define NM_ACTIVE_CONNECTION_IFACE "org.freedesktop.NetworkManager.Connection.Active"
 
 typedef QMap<QString,QVariantMap> ConfigurationData;
@@ -86,7 +88,6 @@
 
     configuration["802-11-wireless"] = wireless;
 
-
     // find the first wlan adapter for now
     auto reply1 = mgr.GetDevices();
     reply1.waitForFinished();
@@ -97,6 +98,7 @@
     auto devices = reply1.value();
 
     QDBusObjectPath dev;
+    QDBusObjectPath access_point("/");
     for (const auto &d : devices) {
         QDBusInterface iface(NM_SERVICE,
                              d.path(),
@@ -105,7 +107,47 @@
 
         auto type_v = iface.property("DeviceType");
         if (type_v.toUInt() == 2 /* NM_DEVICE_TYPE_WIFI */) {
+
+            // We found the device we want to connect.
             dev = d;
+
+            // Create a proxy for Device.Wireless.
+            QDBusInterface wiface(NM_SERVICE,
+                                  d.path(),
+                                  NM_DEVICE_WIRELESS_IFACE,
+                                  QDBusConnection::systemBus());
+
+            // Get a list of access points and use ssid to find the
+            // one we're trying to connect to.
+            QDBusMessage ap_msg = wiface.call("GetAllAccessPoints");
+            if (ap_msg.type() == QDBusMessage::ReplyMessage && ap_msg.arguments().count() == 1) {
+
+                // Get arguments.
+                QList<QVariant> ap_variant = ap_msg.arguments();
+
+                // Cast the first QVariant argument as QDBusArgument.
+                QDBusArgument ap_argument = ap_variant.at(0).value<QDBusArgument>();
+
+                // Cast the argument to a list of DBus object paths.
+                QList<QDBusObjectPath> ap_list = qdbus_cast<QList<QDBusObjectPath>>(ap_argument);
+
+                // Loop through the list of paths looking for our ssid.
+                for(int i=0; i<ap_list.size(); ++i){
+
+                    // Proxy for AccessPoint.
+                    QDBusInterface aiface(NM_SERVICE,
+                                          ap_list[i].path(),
+                                          NM_AP_IFACE,
+                                          QDBusConnection::systemBus());
+
+                    auto ssid_v = aiface.property("Ssid");
+
+                    if (QString::compare(ssid.toLatin1(), ssid_v.toString(), Qt::CaseSensitive) == 0) {
+                        access_point = ap_list[i];
+                        break;
+                    }
+                }
+            }
             break;
         }
     }
@@ -135,7 +177,7 @@
     QDBusObjectPath tmp;
     auto reply2 = mgr.AddAndActivateConnection(configuration,
                                                dev,
-                                               QDBusObjectPath("/"),
+                                               access_point,
                                                tmp);
     if(!reply2.isValid()) {
         qWarning() << "Could not connect: " << reply2.error().message() << "\n";

=== modified file 'tests/autopilot/ubuntu_system_settings/__init__.py'
--- tests/autopilot/ubuntu_system_settings/__init__.py	2015-05-12 16:29:02 +0000
+++ tests/autopilot/ubuntu_system_settings/__init__.py	2015-06-25 12:53:56 +0000
@@ -28,6 +28,7 @@
 import autopilot.logging
 import ubuntuuitoolkit
 from autopilot import introspection
+from autopilot.exceptions import StateNotFoundError
 from ubuntu_system_settings.utils.i18n import ugettext as _
 
 logger = logging.getLogger(__name__)
@@ -945,8 +946,8 @@
     @autopilot.logging.log_action(logger.debug)
     def have_wireless(self):
         try:
-            self.wait_select_single('SwitchMenuItem', text=_('Wi-Fi'))
-        except:
+            self.wait_select_single('SwitchMenu', text=_('Wi-Fi'))
+        except StateNotFoundError:
             return False
         return True
 
@@ -957,11 +958,11 @@
     @autopilot.logging.log_action(logger.debug)
     def get_wireless(self):
         return self.wait_select_single(
-            'SwitchMenuItem', text=_('Wi-Fi')).checked
+            'SwitchMenu', text=_('Wi-Fi')).checked
 
     @autopilot.logging.log_action(logger.debug)
     def _set_wireless(self, state):
-        obj = self.wait_select_single('SwitchMenuItem', text=_('Wi-Fi'))
+        obj = self.wait_select_single('SwitchMenu', text=_('Wi-Fi'))
         if obj.checked != state:
             self.pointing_device.click_object(obj)
 
@@ -1076,7 +1077,10 @@
         :returns: None
 
         """
-        self._set_security(security)
+
+        # We only set security if not none, since none is default
+        if security != 'none':
+            self._set_security(security)
 
     @autopilot.logging.log_action(logger.debug)
     def _expand_security_list(self):

=== modified file 'tests/autopilot/ubuntu_system_settings/tests/__init__.py'
--- tests/autopilot/ubuntu_system_settings/tests/__init__.py	2015-04-16 15:24:41 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/__init__.py	2015-06-25 12:53:56 +0000
@@ -20,6 +20,7 @@
 import dbus
 import dbusmock
 import os
+import random
 import subprocess
 from datetime import datetime
 from time import sleep
@@ -27,6 +28,8 @@
 import ubuntuuitoolkit
 from autopilot import platform
 from autopilot.matchers import Eventually
+from dbusmock.templates.networkmanager import (InfrastructureMode,
+                                               NM80211ApSecurityFlags)
 from fixtures import EnvironmentVariable
 from gi.repository import UPowerGlib
 from testtools.matchers import Equals, NotEquals, GreaterThan
@@ -871,5 +874,24 @@
             NM_SERVICE, self.device_path),
             dbusmock.MOCK_IFACE)
 
+        self.ap_mock = self.create_access_point('test_ap', 'test_ap')
+
         super(WifiBaseTestCase, self).setUp()
         self.wifi_page = self.main_view.go_to_wifi_page()
+
+    def create_access_point(self, name, ssid, secured=True):
+
+        if secured:
+            security = NM80211ApSecurityFlags.NM_802_11_AP_SEC_KEY_MGMT_PSK
+        else:
+            security = NM80211ApSecurityFlags.NM_802_11_AP_SEC_NONE
+
+        return self.dbusmock.AddAccessPoint(
+            self.device_path, name, ssid, self.random_mac_address(),
+            InfrastructureMode.NM_802_11_MODE_INFRA, 2425, 5400, 82, security)
+
+    def random_mac_address(self):
+        """Returns a random Mac Address"""
+        mac = [0x00, 0x16, 0x3e, random.randint(0x00, 0x7f),
+               random.randint(0x00, 0xff), random.randint(0x00, 0xff)]
+        return ':'.join(map(lambda x: "%02x" % x, mac))

=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_wifi.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_wifi.py	2015-04-01 12:35:10 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_wifi.py	2015-06-25 12:53:56 +0000
@@ -7,9 +7,7 @@
 
 from __future__ import absolute_import
 from autopilot.matchers import Eventually
-from dbusmock.templates.networkmanager import (DEVICE_IFACE,
-                                               InfrastructureMode,
-                                               NM80211ApSecurityFlags)
+from dbusmock.templates.networkmanager import DEVICE_IFACE
 from testtools.matchers import Equals
 from time import sleep
 from ubuntu_system_settings.tests import WifiBaseTestCase
@@ -33,23 +31,13 @@
             self.wifi_page._set_wireless, self.wifi_page.get_wireless())
         self.wifi_page.enable_wireless()
         dialog = self.wifi_page.connect_to_hidden_network(
-            'yeah',
+            'test_ap',
             scroll_to_and_click=self.main_view
             .scroll_to_and_click)
 
         # allow backend to set up listeners
         sleep(0.3)
 
-        """Mock a StateChanged signal on the Device, using a likely
-        scenario of a not found SSID:
-            newState = 120 # NM_DEVICE_STATE_FAILED
-            oldState = 0 # does not matter
-            reason = 53 # NM_DEVICE_STATE_REASON_SSID_NOT_FOUND
-        """
-
-        self.device_mock.EmitSignal(
-            DEVICE_IFACE, 'StateChanged', 'uuu', [100, 0, 0])
-
         if dialog:
             dialog.wait_until_destroyed()
 
@@ -60,7 +48,7 @@
             self.wifi_page._set_wireless, self.wifi_page.get_wireless())
         self.wifi_page.enable_wireless()
         dialog = self.wifi_page.connect_to_hidden_network(
-            'yeah',
+            'n/a',
             scroll_to_and_click=self.main_view
             .scroll_to_and_click)
 
@@ -72,6 +60,11 @@
             newState = 120 # NM_DEVICE_STATE_FAILED
             oldState = 0 # does not matter
             reason = 53 # NM_DEVICE_STATE_REASON_SSID_NOT_FOUND
+
+            We manually emit this signal, because the networkmanager mock
+            currently does not support this. See [1].
+
+            [1] https://github.com/martinpitt/python-dbusmock/issues/8
         """
 
         self.device_mock.EmitSignal(
@@ -81,7 +74,8 @@
             dialog.text, Eventually(Equals(
                 _('The Wi-Fi network could not be found'))))
 
-    @skip('skipped due to bug 1337556')
+    @skip('skipped due to %s' % (
+        'https://github.com/martinpitt/python-dbusmock/issues/7'))
     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')
@@ -89,27 +83,18 @@
             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',
+            'test_ap', security='wpa', password='abcdefgh',
             scroll_to_and_click=self.main_view
             .scroll_to_and_click)
 
         # allow backend to set up listeners
         sleep(0.3)
 
-        """Mock a StateChanged signal on the Device, which
-        lets the backend know it was the wrong secret:
-            newState = 100 # NM_DEVICE_STATE_ACTIVATED
-            oldState = 0 # does not matter
-            reason = 0 # does not matter
-        """
-
-        self.device_mock.EmitSignal(
-            DEVICE_IFACE, 'StateChanged', 'uuu', [100, 0, 0])
-
         if dialog:
             dialog.wait_until_destroyed()
 
-    @skip('skipped due to bug 1337556')
+    @skip('skipped due to %s' % (
+        'https://github.com/martinpitt/python-dbusmock/issues/7'))
     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')
@@ -117,26 +102,18 @@
             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',
+            'test_ap', security='wpa', password='abcdefgh',
             scroll_to_and_click=self.main_view
             .scroll_to_and_click)
+
         # allow backend to set up listeners
         sleep(0.3)
 
-        """Mock a StateChanged signal on the Device, which
-        lets the backend know it was the wrong secret:
-            newState = 120 # NM_DEVICE_STATE_FAILED
-            oldState = 0 # does not matter
-            reason = 7 # NM_DEVICE_STATE_REASON_NO_SECRETS
-        """
-
-        self.device_mock.EmitSignal(
-            DEVICE_IFACE, 'StateChanged', 'uuu', [120, 0, 7])
-
         self.assertThat(
             dialog.text, Eventually(Equals(
                 _('Your authentication details were incorrect'))))
 
+    @skip('networkmanager mock does not yet support deletion of cons')
     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')
@@ -176,14 +153,10 @@
         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)
-
+        for idx, ssid in enumerate(access_points):
+            self.create_access_point('Mock_AP%d' % idx, ssid)
             self.dbusmock.AddWiFiConnection(
-                self.device_path, 'Mock_Con%d' % idx, ap, '')
+                self.device_path, 'Mock_Con%d' % idx, ssid, '')
 
         self.wifi_page.remove_previous_network(
             access_points[0], scroll_to_and_click=click_method)
@@ -192,5 +165,9 @@
 
         # wait for ui to update
         sleep(2)
+
         self.wifi_page.remove_previous_network(
             access_points[2], scroll_to_and_click=click_method)
+
+        # We cannot make any assertions, because connection deletion
+        # is currently not supported.