Imported Upstream version 0.8.4.0 upstream/0.8.4.0

5 files changed, 23 insertions, 1621 deletions

diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 296668aa..62612a0e 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -6,10 +6,7 @@ INCLUDES = \
 	-I$(top_srcdir)/src \
 	-I$(top_builddir)/src
 
-noinst_PROGRAMS = \
-	test-dhcp-options \
-	test-policy-hosts \
-	test-wifi-ap-utils
+noinst_PROGRAMS = test-dhcp-options test-policy-hosts
 
 ####### DHCP options test #######
 
@@ -42,33 +39,11 @@ test_policy_hosts_LDADD = \
 	$(top_builddir)/src/libtest-policy-hosts.la \
 	$(GLIB_LIBS)
 
-####### wifi ap utils test #######
-
-test_wifi_ap_utils_SOURCES = \
-	test-wifi-ap-utils.c
-
-test_wifi_ap_utils_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS)
-
-test_wifi_ap_utils_LDADD = \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(top_builddir)/src/libtest-wifi-ap-utils.la \
-	$(GLIB_LIBS) \
-	$(DBUS_LIBS)
-
-####### secret agent interface test #######
-
-EXTRA_DIST = test-secret-agent.py
-
-###########################################
-
 if WITH_TESTS
 
-check-local: test-dhcp-options test-policy-hosts test-wifi-ap-utils
+check-local: test-dhcp-options
 	$(abs_builddir)/test-dhcp-options
 	$(abs_builddir)/test-policy-hosts
-	$(abs_builddir)/test-wifi-ap-utils
 
 endif
 
diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in
index f702ac86..1b9c0833 100644
--- a/src/tests/Makefile.in
+++ b/src/tests/Makefile.in
@@ -35,21 +35,16 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 noinst_PROGRAMS = test-dhcp-options$(EXEEXT) \
-	test-policy-hosts$(EXEEXT) test-wifi-ap-utils$(EXEEXT)
+	test-policy-hosts$(EXEEXT)
 subdir = src/tests
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -75,15 +70,8 @@ test_policy_hosts_OBJECTS = $(am_test_policy_hosts_OBJECTS)
 test_policy_hosts_DEPENDENCIES =  \
 	$(top_builddir)/src/libtest-policy-hosts.la \
 	$(am__DEPENDENCIES_1)
-am_test_wifi_ap_utils_OBJECTS =  \
-	test_wifi_ap_utils-test-wifi-ap-utils.$(OBJEXT)
-test_wifi_ap_utils_OBJECTS = $(am_test_wifi_ap_utils_OBJECTS)
-test_wifi_ap_utils_DEPENDENCIES =  \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(top_builddir)/src/libtest-wifi-ap-utils.la \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
+depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -108,14 +96,14 @@ am__v_CCLD_0 = @echo "  CCLD  " $@;
 AM_V_GEN = $(am__v_GEN_$(V))
 am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
 am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(test_dhcp_options_SOURCES) $(test_policy_hosts_SOURCES) \
-	$(test_wifi_ap_utils_SOURCES)
+SOURCES = $(test_dhcp_options_SOURCES) $(test_policy_hosts_SOURCES)
 DIST_SOURCES = $(test_dhcp_options_SOURCES) \
-	$(test_policy_hosts_SOURCES) $(test_wifi_ap_utils_SOURCES)
+	$(test_policy_hosts_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -124,6 +112,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -140,7 +130,6 @@ DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
 DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
-DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -149,7 +138,6 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
@@ -158,8 +146,8 @@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GMODULE_CFLAGS = @GMODULE_CFLAGS@
 GMODULE_LIBS = @GMODULE_LIBS@
+GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
@@ -174,23 +162,13 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
-INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
-INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
-INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
-INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
-INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
-INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
-INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 IPTABLES_PATH = @IPTABLES_PATH@
-IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
-IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
@@ -198,8 +176,6 @@ LIBDL = @LIBDL@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
 LIBM = @LIBM@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
 LIBNL_LIBS = @LIBNL_LIBS@
@@ -208,15 +184,13 @@ LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
+MSGFMT_OPTS = @MSGFMT_OPTS@
 MSGMERGE = @MSGMERGE@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -242,9 +216,12 @@ PKGCONFIG_PATH = @PKGCONFIG_PATH@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POFILES = @POFILES@
 POLKIT_CFLAGS = @POLKIT_CFLAGS@
 POLKIT_LIBS = @POLKIT_LIBS@
 POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 RANLIB = @RANLIB@
 RESOLVCONF_PATH = @RESOLVCONF_PATH@
@@ -259,13 +236,10 @@ UUID_CFLAGS = @UUID_CFLAGS@
 UUID_LIBS = @UUID_LIBS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -353,24 +327,6 @@ test_policy_hosts_LDADD = \
 	$(top_builddir)/src/libtest-policy-hosts.la \
 	$(GLIB_LIBS)
 
-
-####### wifi ap utils test #######
-test_wifi_ap_utils_SOURCES = \
-	test-wifi-ap-utils.c
-
-test_wifi_ap_utils_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS)
-
-test_wifi_ap_utils_LDADD = \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(top_builddir)/src/libtest-wifi-ap-utils.la \
-	$(GLIB_LIBS) \
-	$(DBUS_LIBS)
-
-
-####### secret agent interface test #######
-EXTRA_DIST = test-secret-agent.py
 all: all-am
 
 .SUFFIXES:
@@ -420,9 +376,6 @@ test-dhcp-options$(EXEEXT): $(test_dhcp_options_OBJECTS) $(test_dhcp_options_DEP
 test-policy-hosts$(EXEEXT): $(test_policy_hosts_OBJECTS) $(test_policy_hosts_DEPENDENCIES) 
 	@rm -f test-policy-hosts$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_policy_hosts_OBJECTS) $(test_policy_hosts_LDADD) $(LIBS)
-test-wifi-ap-utils$(EXEEXT): $(test_wifi_ap_utils_OBJECTS) $(test_wifi_ap_utils_DEPENDENCIES) 
-	@rm -f test-wifi-ap-utils$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(test_wifi_ap_utils_OBJECTS) $(test_wifi_ap_utils_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -432,7 +385,6 @@ distclean-compile:
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_dhcp_options-test-dhcp-options.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_policy_hosts-test-policy-hosts.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_wifi_ap_utils-test-wifi-ap-utils.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -493,22 +445,6 @@ test_policy_hosts-test-policy-hosts.obj: test-policy-hosts.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_policy_hosts_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_policy_hosts-test-policy-hosts.obj `if test -f 'test-policy-hosts.c'; then $(CYGPATH_W) 'test-policy-hosts.c'; else $(CYGPATH_W) '$(srcdir)/test-policy-hosts.c'; fi`
 
-test_wifi_ap_utils-test-wifi-ap-utils.o: test-wifi-ap-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_wifi_ap_utils_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_wifi_ap_utils-test-wifi-ap-utils.o -MD -MP -MF $(DEPDIR)/test_wifi_ap_utils-test-wifi-ap-utils.Tpo -c -o test_wifi_ap_utils-test-wifi-ap-utils.o `test -f 'test-wifi-ap-utils.c' || echo '$(srcdir)/'`test-wifi-ap-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_wifi_ap_utils-test-wifi-ap-utils.Tpo $(DEPDIR)/test_wifi_ap_utils-test-wifi-ap-utils.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test-wifi-ap-utils.c' object='test_wifi_ap_utils-test-wifi-ap-utils.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_wifi_ap_utils_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_wifi_ap_utils-test-wifi-ap-utils.o `test -f 'test-wifi-ap-utils.c' || echo '$(srcdir)/'`test-wifi-ap-utils.c
-
-test_wifi_ap_utils-test-wifi-ap-utils.obj: test-wifi-ap-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_wifi_ap_utils_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_wifi_ap_utils-test-wifi-ap-utils.obj -MD -MP -MF $(DEPDIR)/test_wifi_ap_utils-test-wifi-ap-utils.Tpo -c -o test_wifi_ap_utils-test-wifi-ap-utils.obj `if test -f 'test-wifi-ap-utils.c'; then $(CYGPATH_W) 'test-wifi-ap-utils.c'; else $(CYGPATH_W) '$(srcdir)/test-wifi-ap-utils.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_wifi_ap_utils-test-wifi-ap-utils.Tpo $(DEPDIR)/test_wifi_ap_utils-test-wifi-ap-utils.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test-wifi-ap-utils.c' object='test_wifi_ap_utils-test-wifi-ap-utils.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_wifi_ap_utils_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_wifi_ap_utils-test-wifi-ap-utils.obj `if test -f 'test-wifi-ap-utils.c'; then $(CYGPATH_W) 'test-wifi-ap-utils.c'; else $(CYGPATH_W) '$(srcdir)/test-wifi-ap-utils.c'; fi`
-
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -716,12 +652,9 @@ uninstall-am:
 	tags uninstall uninstall-am
 
 
-###########################################
-
-@WITH_TESTS_TRUE@check-local: test-dhcp-options test-policy-hosts test-wifi-ap-utils
+@WITH_TESTS_TRUE@check-local: test-dhcp-options
 @WITH_TESTS_TRUE@	$(abs_builddir)/test-dhcp-options
 @WITH_TESTS_TRUE@	$(abs_builddir)/test-policy-hosts
-@WITH_TESTS_TRUE@	$(abs_builddir)/test-wifi-ap-utils
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/src/tests/test-policy-hosts.c b/src/tests/test-policy-hosts.c
index 68175890..62862e75 100644
--- a/src/tests/test-policy-hosts.c
+++ b/src/tests/test-policy-hosts.c
@@ -23,7 +23,7 @@
 
 #include "nm-policy-hosts.h"
 
-#define DEBUG 0
+#define DEBUG 1
 
 static void
 test_generic (const char *before, const char *after)
diff --git a/src/tests/test-secret-agent.py b/src/tests/test-secret-agent.py
deleted file mode 100755
index 3b21c610..00000000
--- a/src/tests/test-secret-agent.py
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/usr/bin/env python
-# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-
-import glib
-import gobject
-import sys
-import dbus
-import dbus.service
-import dbus.mainloop.glib
-
-IFACE_SECRET_AGENT = 'org.freedesktop.NetworkManager.SecretAgent'
-IFACE_AGENT_MANAGER = 'org.freedesktop.NetworkManager.AgentManager'
-
-class NotAuthorizedException(dbus.DBusException):
-    _dbus_error_name = IFACE_SECRET_AGENT + '.NotAuthorized'
-
-class Agent(dbus.service.Object):
-    def __init__(self, bus, object_path):
-        self.agents = {}
-        self.bus = bus
-        dbus.service.Object.__init__(self, bus, object_path)
-
-    @dbus.service.method(IFACE_SECRET_AGENT,
-                         in_signature='a{sa{sv}}osasb',
-                         out_signature='a{sa{sv}}',
-                         sender_keyword='sender')
-    def GetSecrets(self, connection_hash, connection_path, setting_name, hints, request_new, sender=None):
-        if not sender:
-            raise NotAuthorizedException("Internal error: couldn't get sender")
-        uid = self.bus.get_unix_user(sender)
-        if uid != 0:
-            raise NotAuthorizedException("UID %d not authorized" % uid)
-
-        print "Secrets requested path '%s' setting '%s' hints '%s' new %d" % (connection_path, setting_name, str(hints), request_new)
-
-        # return some random GSM secrets
-        s_gsm = dbus.Dictionary({'password': 'asdfadfasdfaf'})
-        con = dbus.Dictionary({'gsm': s_gsm})
-        return con
-
-def register(proxy):
-    proxy.Register("test.agent.id", dbus_interface=IFACE_AGENT_MANAGER)
-    print "Registered!"
-    return False
-
-def unregister(proxy, loop):
-    proxy.Unregister(dbus_interface=IFACE_AGENT_MANAGER)
-    loop.quit()
-    return False
-
-def main():
-    dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
-
-    bus = dbus.SystemBus()
-    obj = Agent(bus, "/org/freedesktop/NetworkManager/SecretAgent")
-    proxy = bus.get_object("org.freedesktop.NetworkManager",
-                           "/org/freedesktop/NetworkManager/AgentManager")
-
-    mainloop = gobject.MainLoop()
-
-    gobject.idle_add(register, proxy)
-    print "Running test secret agent" 
-
-    try:
-        mainloop.run()
-    except KeyboardInterrupt, e:
-        pass
-
-    print "Unregistering..."
-    unregister(proxy, mainloop);
-
-if __name__ == '__main__':
-    main()
-
diff --git a/src/tests/test-wifi-ap-utils.c b/src/tests/test-wifi-ap-utils.c
deleted file mode 100644
index deb31f3f..00000000
--- a/src/tests/test-wifi-ap-utils.c
+++ /dev/null
@@ -1,1432 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Copyright (C) 2011 Red Hat, Inc.
- *
- */
-
-#include <glib.h>
-#include <string.h>
-
-#include "nm-wifi-ap-utils.h"
-#include "nm-dbus-glib-types.h"
-
-#include "nm-setting-connection.h"
-#include "nm-setting-wireless.h"
-#include "nm-setting-wireless-security.h"
-#include "nm-setting-8021x.h"
-
-#define DEBUG 1
-
-/*******************************************/
-
-#define COMPARE(src, expected, success, error, edomain, ecode) \
-{ \
-	if (expected) { \
-		if (!success) { \
-			g_assert (error != NULL); \
-			g_warning ("Failed to complete connection: (%d) %s", error->code, error->message); \
-		} \
-		g_assert (success == TRUE); \
-		g_assert (error == NULL); \
-\
-		success = nm_connection_compare (src, expected, NM_SETTING_COMPARE_FLAG_EXACT); \
-		if (success == FALSE && DEBUG) { \
-			g_message ("\n- COMPLETED ---------------------------------\n"); \
-			nm_connection_dump (src); \
-			g_message ("+ EXPECTED ++++++++++++++++++++++++++++++++++++\n"); \
-			nm_connection_dump (expected); \
-			g_message ("^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"); \
-		} \
-		g_assert (success == TRUE); \
-	} else { \
-		if (success) { \
-			g_message ("\n- COMPLETED ---------------------------------\n"); \
-			nm_connection_dump (src); \
-		} \
-		g_assert (success == FALSE); \
-		g_assert_error (error, edomain, ecode); \
-	} \
- \
-	g_clear_error (&error); \
-}
-
-static gboolean
-complete_connection (const char *ssid,
-                     const guint8 bssid[ETH_ALEN],
-                     NM80211Mode mode,
-                     guint32 flags,
-                     guint32 wpa_flags,
-                     guint32 rsn_flags,
-                     gboolean lock_bssid,
-                     NMConnection *src,
-                     GError **error)
-{
-	GByteArray *tmp;
-	gboolean success;
-
-	tmp = g_byte_array_sized_new (strlen (ssid));
-	g_byte_array_append (tmp, (const guint8 *) ssid, strlen (ssid));
-
-	success = nm_ap_utils_complete_connection (tmp,
-	                                           bssid,
-	                                           mode,
-	                                           flags,
-	                                           wpa_flags,
-	                                           rsn_flags,
-	                                           src,
-	                                           lock_bssid,
-	                                           error);
-	g_byte_array_free (tmp, TRUE);
-	return success;
-}
-
-typedef struct {
-	const char *key;
-	const char *str;
-	guint32     uint;
-} KeyData;
-
-static void
-set_items (NMSetting *setting, const KeyData *items)
-{
-	const KeyData *item;
-	GParamSpec *pspec;
-	GByteArray *tmp;
-
-	for (item = items; item && item->key; item++) {
-		g_assert (item->key);
-		pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (setting), item->key);
-		g_assert (pspec);
-
-		if (pspec->value_type == G_TYPE_STRING) {
-			g_assert (item->uint == 0);
-			if (item->str)
-				g_object_set (G_OBJECT (setting), item->key, item->str, NULL);
-		} else if (pspec->value_type == G_TYPE_UINT) {
-			g_assert (item->str == NULL);
-			g_object_set (G_OBJECT (setting), item->key, item->uint, NULL);
-		} else if (pspec->value_type == G_TYPE_INT) {
-			gint foo = (gint) item->uint;
-
-			g_assert (item->str == NULL);
-			g_object_set (G_OBJECT (setting), item->key, foo, NULL);
-		} else if (pspec->value_type == G_TYPE_BOOLEAN) {
-			gboolean foo = !! (item->uint);
-
-			g_assert (item->str == NULL);
-			g_object_set (G_OBJECT (setting), item->key, foo, NULL);
-		} else if (pspec->value_type == DBUS_TYPE_G_UCHAR_ARRAY) {
-			g_assert (item->str);
-			tmp = g_byte_array_sized_new (strlen (item->str));
-			g_byte_array_append (tmp, (const guint8 *) item->str, strlen (item->str));
-			g_object_set (G_OBJECT (setting), item->key, tmp, NULL);
-			g_byte_array_free (tmp, TRUE);
-		} else {
-			/* Special types, check based on property name */
-			if (!strcmp (item->key, NM_SETTING_WIRELESS_SECURITY_PROTO))
-				nm_setting_wireless_security_add_proto (NM_SETTING_WIRELESS_SECURITY (setting), item->str);
-			else if (!strcmp (item->key, NM_SETTING_WIRELESS_SECURITY_PAIRWISE))
-				nm_setting_wireless_security_add_pairwise (NM_SETTING_WIRELESS_SECURITY (setting), item->str);
-			else if (!strcmp (item->key, NM_SETTING_WIRELESS_SECURITY_GROUP))
-				nm_setting_wireless_security_add_group (NM_SETTING_WIRELESS_SECURITY (setting), item->str);
-			else if (!strcmp (item->key, NM_SETTING_802_1X_EAP))
-				nm_setting_802_1x_add_eap_method (NM_SETTING_802_1X (setting), item->str);
-		}
-	}
-}
-
-static NMSettingWireless *
-fill_wifi_empty (NMConnection *connection)
-{
-	NMSettingWireless *s_wifi;
-
-	s_wifi = (NMSettingWireless *) nm_connection_get_setting (connection, NM_TYPE_SETTING_WIRELESS);
-	if (!s_wifi) {
-		s_wifi = (NMSettingWireless *) nm_setting_wireless_new ();
-		nm_connection_add_setting (connection, NM_SETTING (s_wifi));
-	}
-	return s_wifi;
-}
-
-static NMSettingWireless *
-fill_wifi (NMConnection *connection, const KeyData items[])
-{
-	NMSettingWireless *s_wifi;
-
-	s_wifi = (NMSettingWireless *) nm_connection_get_setting (connection, NM_TYPE_SETTING_WIRELESS);
-	if (!s_wifi) {
-		s_wifi = (NMSettingWireless *) nm_setting_wireless_new ();
-		nm_connection_add_setting (connection, NM_SETTING (s_wifi));
-	}
-
-	set_items (NM_SETTING (s_wifi), items);
-	return s_wifi;
-}
-
-static NMSettingWirelessSecurity *
-fill_wsec (NMConnection *connection, const KeyData items[])
-{
-	NMSettingWirelessSecurity *s_wsec;
-
-	s_wsec = (NMSettingWirelessSecurity *) nm_connection_get_setting (connection, NM_TYPE_SETTING_WIRELESS_SECURITY);
-	if (!s_wsec) {
-		s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new ();
-		nm_connection_add_setting (connection, NM_SETTING (s_wsec));
-	}
-
-	set_items (NM_SETTING (s_wsec), items);
-	return s_wsec;
-}
-
-static NMSetting8021x *
-fill_8021x (NMConnection *connection, const KeyData items[])
-{
-	NMSetting8021x *s_8021x;
-
-	s_8021x = (NMSetting8021x *) nm_connection_get_setting (connection, NM_TYPE_SETTING_802_1X);
-	if (!s_8021x) {
-		s_8021x = (NMSetting8021x *) nm_setting_802_1x_new ();
-		nm_connection_add_setting (connection, NM_SETTING (s_8021x));
-	}
-
-	set_items (NM_SETTING (s_8021x), items);
-	return s_8021x;
-}
-
-static NMConnection *
-create_basic (const char *ssid,
-              const guint8 *bssid,
-              NM80211Mode mode,
-              gboolean set_security)
-{
-	NMConnection *connection;
-	NMSettingWireless *s_wifi = NULL;
-	GByteArray *tmp;
-
-	connection = nm_connection_new ();
-
-	s_wifi = (NMSettingWireless *) nm_setting_wireless_new ();
-	nm_connection_add_setting (connection, NM_SETTING (s_wifi));
-
-	/* SSID */
-	tmp = g_byte_array_sized_new (strlen (ssid));
-	g_byte_array_append (tmp, (const guint8 *) ssid, strlen (ssid));
-	g_object_set (G_OBJECT (s_wifi), NM_SETTING_WIRELESS_SSID, tmp, NULL);
-	g_byte_array_free (tmp, TRUE);
-
-	/* BSSID */
-	if (bssid) {
-		tmp = g_byte_array_sized_new (ETH_ALEN);
-		g_byte_array_append (tmp, bssid, ETH_ALEN);
-		g_object_set (G_OBJECT (s_wifi), NM_SETTING_WIRELESS_BSSID, tmp, NULL);
-		g_byte_array_free (tmp, TRUE);
-	}
-
-	if (mode == NM_802_11_MODE_INFRA)
-		g_object_set (G_OBJECT (s_wifi), NM_SETTING_WIRELESS_MODE, "infrastructure", NULL);
-	else if (mode == NM_802_11_MODE_ADHOC)
-		g_object_set (G_OBJECT (s_wifi), NM_SETTING_WIRELESS_MODE, "adhoc", NULL);
-	else
-		g_assert_not_reached ();
-
-	if (set_security)
-		g_object_set (G_OBJECT (s_wifi), NM_SETTING_WIRELESS_SEC, NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, NULL);
-
-	return connection;
-}
-
-/*******************************************/
-
-static void
-test_lock_bssid (void)
-{
-	NMConnection *src, *expected;
-	const guint8 bssid[ETH_ALEN] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 };
-	const char *ssid = "blahblah";
-	gboolean success;
-	GError *error = NULL;
-
-	src = nm_connection_new ();
-	success = complete_connection (ssid, bssid,
-	                               NM_802_11_MODE_INFRA, NM_802_11_AP_FLAGS_NONE,
-	                               NM_802_11_AP_SEC_NONE, NM_802_11_AP_SEC_NONE,
-	                               TRUE,
-	                               src, &error);
-	expected = create_basic (ssid, bssid, NM_802_11_MODE_INFRA, FALSE);
-	COMPARE (src, expected, success, error, 0, 0);
-
-	g_object_unref (src);
-	g_object_unref (expected);
-}
-
-/*******************************************/
-
-static void
-test_open_ap_empty_connection (void)
-{
-	NMConnection *src, *expected;
-	const guint8 bssid[ETH_ALEN] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 };
-	const char *ssid = "blahblah";
-	gboolean success;
-	GError *error = NULL;
-
-	/* Test that an empty source connection is correctly filled with the
-	 * SSID and Infra modes of the given AP details.
-	 */
-
-	src = nm_connection_new ();
-	success = complete_connection (ssid, bssid,
-	                               NM_802_11_MODE_INFRA, NM_802_11_AP_FLAGS_NONE,
-	                               NM_802_11_AP_SEC_NONE, NM_802_11_AP_SEC_NONE,
-	                               FALSE,
-	                               src, &error);
-	expected = create_basic (ssid, NULL, NM_802_11_MODE_INFRA, FALSE);
-	COMPARE (src, expected, success, error, 0, 0);
-
-	g_object_unref (src);
-	g_object_unref (expected);
-}
-
-/*******************************************/
-
-static void
-test_open_ap_leap_connection_1 (gboolean add_wifi)
-{
-	NMConnection *src;
-	const guint8 bssid[ETH_ALEN] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 };
-	const KeyData src_wsec[] = { { NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME, "Bill Smith", 0 }, { NULL } };
-	gboolean success;
-	GError *error = NULL;
-
-	/* Test that a basic connection filled with a LEAP username is
-	 * rejected when completion is attempted with an open AP.  LEAP requires
-	 * the AP to have the Privacy bit set.
-	 */
-
-	src = nm_connection_new ();
-	if (add_wifi)
-		fill_wifi_empty (src);
-	fill_wsec (src, src_wsec);
-
-	success = complete_connection ("blahblah", bssid,
-	                               NM_802_11_MODE_INFRA, NM_802_11_AP_FLAGS_NONE,
-	                               NM_802_11_AP_SEC_NONE, NM_802_11_AP_SEC_NONE,
-	                               FALSE,
-	                               src, &error);
-	/* We expect failure */
-	COMPARE (src, NULL, success, error, NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY);
-
-	g_object_unref (src);
-}
-
-/*******************************************/
-
-static void
-test_open_ap_leap_connection_2 (void)
-{
-	NMConnection *src;
-	const guint8 bssid[ETH_ALEN] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 };
-	const KeyData src_wsec[] = { { NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "ieee8021x", 0 }, { NULL } };
-	gboolean success;
-	GError *error = NULL;
-
-	/* Test that a basic connection specifying IEEE8021x security (ie, Dynamic
-	 * WEP or LEAP) is rejected when completion is attempted with an open AP.
-	 */
-
-	src = nm_connection_new ();
-	fill_wifi_empty (src);
-	fill_wsec (src, src_wsec);
-
-	success = complete_connection ("blahblah", bssid,
-	                               NM_802_11_MODE_INFRA, NM_802_11_AP_FLAGS_NONE,
-	                               NM_802_11_AP_SEC_NONE, NM_802_11_AP_SEC_NONE,
-	                               FALSE,
-	                               src, &error);
-	/* We expect failure */
-	COMPARE (src, NULL, success, error, NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY);
-
-	g_object_unref (src);
-}
-
-/*******************************************/
-
-static void
-test_open_ap_wep_connection (gboolean add_wifi)
-{
-	NMConnection *src;
-	const guint8 bssid[ETH_ALEN] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 };
-	const KeyData src_wsec[] = {
-	    { NM_SETTING_WIRELESS_SECURITY_WEP_KEY0, "11111111111111111111111111", 0 },
-	    { NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX, NULL, 0 },
-	    { NM_SETTING_WIRELESS_SECURITY_AUTH_ALG, "open", 0 },
-	    { NULL } };
-	gboolean success;
-	GError *error = NULL;
-
-	/* Test that a static WEP connection is rejected when completion is
-	 * attempted with an open AP.
-	 */
-
-	src = nm_connection_new ();
-	if (add_wifi)
-		fill_wifi_empty (src);
-	fill_wsec (src, src_wsec);
-	success = complete_connection ("blahblah", bssid,
-	                               NM_802_11_MODE_INFRA, NM_802_11_AP_FLAGS_NONE,
-	                               NM_802_11_AP_SEC_NONE, NM_802_11_AP_SEC_NONE,
-	                               FALSE,
-	                               src, &error);
-	/* We expect failure */
-	COMPARE (src, NULL, success, error, NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY);
-
-	g_object_unref (src);
-}
-
-/*******************************************/
-
-static void
-test_ap_wpa_psk_connection_base (const char *key_mgmt,
-                                 const char *auth_alg,
-                                 guint32 flags,
-                                 guint32 wpa_flags,
-                                 guint32 rsn_flags,
-                                 gboolean add_wifi,
-                                 NMConnection *expected)
-{
-	NMConnection *src;
-	const char *ssid = "blahblah";
-	const guint8 bssid[ETH_ALEN] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 };
-	const KeyData exp_wifi[] = {
-		{ NM_SETTING_WIRELESS_SSID, ssid, 0 },
-		{ NM_SETTING_WIRELESS_MODE, "infrastructure", 0 },
-		{ NM_SETTING_WIRELESS_SEC, NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, 0 },
-		{ NULL } };
-	const KeyData both_wsec[] = {
-	    { NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, key_mgmt, 0 },
-	    { NM_SETTING_WIRELESS_SECURITY_AUTH_ALG, auth_alg, 0 },
-	    { NM_SETTING_WIRELESS_SECURITY_PSK, "asdfasdfasdfasdfasdfafs", 0 },
-	    { NULL } };
-	gboolean success;
-	GError *error = NULL;
-
-	src = nm_connection_new ();
-	if (add_wifi)
-		fill_wifi_empty (src);
-	fill_wsec (src, both_wsec);
-	success = complete_connection (ssid, bssid, NM_802_11_MODE_INFRA,
-	                               flags, wpa_flags, rsn_flags,
-	                               FALSE, src, &error);
-	if (expected) {
-		fill_wifi (expected, exp_wifi);
-		fill_wsec (expected, both_wsec);
-	}
-	COMPARE (src, expected, success, error, NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY);
-
-	g_object_unref (src);
-}
-
-static void
-test_open_ap_wpa_psk_connection_1 (void)
-{
-	/* Test that a WPA-PSK connection filling only the PSK itself and *not*
-	 * filling the wifi setting is rejected when completion is attempted with
-	 * an open AP.
-	 */
-	test_ap_wpa_psk_connection_base (NULL, NULL,
-	                                 NM_802_11_AP_FLAGS_NONE,
-	                                 NM_802_11_AP_SEC_NONE,
-	                                 NM_802_11_AP_SEC_NONE,
-	                                 FALSE, NULL);
-}
-
-static void
-test_open_ap_wpa_psk_connection_2 (void)
-{
-	/* Test that a WPA-PSK connection filling only the PSK itself and also
-	 * filling the wifi setting is rejected when completion is attempted with
-	 * an open AP.
-	 */
-	test_ap_wpa_psk_connection_base (NULL, NULL,
-	                                 NM_802_11_AP_FLAGS_NONE,
-	                                 NM_802_11_AP_SEC_NONE,
-	                                 NM_802_11_AP_SEC_NONE,
-	                                 TRUE, NULL);
-}
-
-static void
-test_open_ap_wpa_psk_connection_3 (void)
-{
-	/* Test that a WPA-PSK connection filling the PSK and setting the auth alg
-	 * to 'open' is rejected when completion is attempted with an open AP.
-	 */
-	test_ap_wpa_psk_connection_base (NULL, "open",
-	                                 NM_802_11_AP_FLAGS_NONE,
-	                                 NM_802_11_AP_SEC_NONE,
-	                                 NM_802_11_AP_SEC_NONE,
-	                                 FALSE, NULL);
-}
-
-static void
-test_open_ap_wpa_psk_connection_4 (void)
-{
-	/* Test that a WPA-PSK connection filling the PSK and setting the auth alg
-	 * to 'shared' is rejected when completion is attempted with an open AP.
-	 * Shared auth cannot be used with WPA.
-	 */
-	test_ap_wpa_psk_connection_base (NULL, "shared",
-	                                 NM_802_11_AP_FLAGS_NONE,
-	                                 NM_802_11_AP_SEC_NONE,
-	                                 NM_802_11_AP_SEC_NONE,
-	                                 FALSE, NULL);
-}
-
-static void
-test_open_ap_wpa_psk_connection_5 (void)
-{
-	/* Test that a WPA-PSK connection filling the PSK, the auth algorithm, and
-	 * key management is rejected when completion is attempted with an open AP.
-	 */
-	test_ap_wpa_psk_connection_base ("wpa-psk", "open",
-	                                 NM_802_11_AP_FLAGS_NONE,
-	                                 NM_802_11_AP_SEC_NONE,
-	                                 NM_802_11_AP_SEC_NONE,
-	                                 FALSE, NULL);
-}
-
-/*******************************************/
-
-static void
-test_ap_wpa_eap_connection_base (const char *key_mgmt,
-                                 const char *auth_alg,
-                                 guint32 flags,
-                                 guint32 wpa_flags,
-                                 guint32 rsn_flags,
-                                 gboolean add_wifi,
-                                 guint error_domain,
-                                 guint error_code)
-{
-	NMConnection *src;
-	const guint8 bssid[ETH_ALEN] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 };
-	const KeyData src_empty[] = { { NULL } };
-	const KeyData src_wsec[] = {
-	    { NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, key_mgmt, 0 },
-	    { NM_SETTING_WIRELESS_SECURITY_AUTH_ALG, auth_alg, 0 },
-	    { NULL } };
-	gboolean success;
-	GError *error = NULL;
-
-	src = nm_connection_new ();
-	if (add_wifi)
-		fill_wifi_empty (src);
-	fill_wsec (src, src_wsec);
-	fill_8021x (src, src_empty);
-	success = complete_connection ("blahblah", bssid, NM_802_11_MODE_INFRA,
-	                               flags, wpa_flags, rsn_flags,
-	                               FALSE, src, &error);
-	/* Failure expected */
-	COMPARE (src, NULL, success, error, error_domain, error_code);
-
-	g_object_unref (src);
-}
-
-enum {
-	IDX_NONE = 0,
-	IDX_OPEN,
-	IDX_PRIV,
-	IDX_WPA_PSK_PTKIP_GTKIP,
-	IDX_WPA_PSK_PTKIP_PCCMP_GTKIP,
-	IDX_WPA_RSN_PSK_PTKIP_PCCMP_GTKIP,
-	IDX_WPA_RSN_PSK_PCCMP_GCCMP,
-	IDX_RSN_PSK_PCCMP_GCCMP,
-	IDX_RSN_PSK_PTKIP_PCCMP_GTKIP,
-	IDX_WPA_8021X,
-	IDX_RSN_8021X,
-};
-
-static guint32
-flags_for_idx (guint32 idx)
-{
-	if (idx == IDX_OPEN)
-		return NM_802_11_AP_FLAGS_NONE;
-	else if (   idx == IDX_PRIV
-	         || idx == IDX_WPA_PSK_PTKIP_GTKIP
-	         || idx == IDX_WPA_PSK_PTKIP_PCCMP_GTKIP
-	         || idx == IDX_RSN_PSK_PCCMP_GCCMP
-	         || idx == IDX_RSN_PSK_PTKIP_PCCMP_GTKIP
-	         || idx == IDX_WPA_RSN_PSK_PTKIP_PCCMP_GTKIP
-	         || idx == IDX_WPA_RSN_PSK_PCCMP_GCCMP
-	         || idx == IDX_WPA_8021X
-	         || idx == IDX_RSN_8021X)
-		return NM_802_11_AP_FLAGS_PRIVACY;
-	else
-		g_assert_not_reached ();
-}
-
-static guint32
-wpa_flags_for_idx (guint32 idx)
-{
-	if (idx == IDX_OPEN || idx == IDX_PRIV ||  idx == IDX_RSN_8021X
-	    || idx == IDX_RSN_PSK_PCCMP_GCCMP || idx == IDX_RSN_PSK_PTKIP_PCCMP_GTKIP)
-		return NM_802_11_AP_SEC_NONE;
-	else if (idx == IDX_WPA_PSK_PTKIP_GTKIP)
-		return NM_802_11_AP_SEC_PAIR_TKIP | NM_802_11_AP_SEC_GROUP_TKIP | NM_802_11_AP_SEC_KEY_MGMT_PSK;
-	else if (idx == IDX_WPA_RSN_PSK_PTKIP_PCCMP_GTKIP)
-		return NM_802_11_AP_SEC_PAIR_TKIP | NM_802_11_AP_SEC_PAIR_CCMP | NM_802_11_AP_SEC_GROUP_TKIP | NM_802_11_AP_SEC_KEY_MGMT_PSK;
-	else if (IDX_WPA_RSN_PSK_PCCMP_GCCMP)
-		return NM_802_11_AP_SEC_PAIR_CCMP | NM_802_11_AP_SEC_GROUP_CCMP | NM_802_11_AP_SEC_KEY_MGMT_PSK;
-	else if (idx == IDX_WPA_8021X)
-		return NM_802_11_AP_SEC_PAIR_TKIP | NM_802_11_AP_SEC_GROUP_TKIP | NM_802_11_AP_SEC_KEY_MGMT_802_1X;
-	else
-		g_assert_not_reached ();
-}
-
-static guint32
-rsn_flags_for_idx (guint32 idx)
-{
-	if (idx == IDX_OPEN || idx == IDX_PRIV || idx == IDX_WPA_8021X
-	    || idx == IDX_WPA_PSK_PTKIP_GTKIP || idx == IDX_WPA_PSK_PTKIP_PCCMP_GTKIP)
-		return NM_802_11_AP_SEC_NONE;
-	else if (idx == IDX_RSN_PSK_PCCMP_GCCMP)
-		return NM_802_11_AP_SEC_PAIR_CCMP | NM_802_11_AP_SEC_GROUP_CCMP | NM_802_11_AP_SEC_KEY_MGMT_PSK;
-	else if (idx == IDX_RSN_PSK_PTKIP_PCCMP_GTKIP)
-		return NM_802_11_AP_SEC_PAIR_TKIP | NM_802_11_AP_SEC_PAIR_CCMP | NM_802_11_AP_SEC_GROUP_TKIP | NM_802_11_AP_SEC_KEY_MGMT_PSK;
-	else if (idx == IDX_WPA_RSN_PSK_PTKIP_PCCMP_GTKIP)
-		return NM_802_11_AP_SEC_PAIR_TKIP | NM_802_11_AP_SEC_PAIR_CCMP | NM_802_11_AP_SEC_GROUP_TKIP | NM_802_11_AP_SEC_KEY_MGMT_PSK;
-	else if (idx == IDX_WPA_RSN_PSK_PCCMP_GCCMP)
-		return NM_802_11_AP_SEC_PAIR_CCMP | NM_802_11_AP_SEC_GROUP_CCMP | NM_802_11_AP_SEC_KEY_MGMT_PSK;
-	else if (idx == IDX_RSN_8021X)
-		return NM_802_11_AP_SEC_PAIR_CCMP | NM_802_11_AP_SEC_GROUP_CCMP | NM_802_11_AP_SEC_KEY_MGMT_802_1X;
-	else
-		g_assert_not_reached ();
-}
-
-static guint32
-error_domain_for_idx (guint32 idx, guint num)
-{
-	if (idx == IDX_OPEN)
-		return NM_SETTING_WIRELESS_SECURITY_ERROR;
-	else if (idx == IDX_PRIV) {
-		if (num <= 3)
-			return NM_SETTING_802_1X_ERROR;
-		else
-			return NM_SETTING_WIRELESS_SECURITY_ERROR;
-	} else if (idx == IDX_WPA_PSK_PTKIP_GTKIP || idx == IDX_WPA_PSK_PTKIP_PCCMP_GTKIP
-	           || idx == IDX_WPA_RSN_PSK_PCCMP_GCCMP || idx == IDX_WPA_RSN_PSK_PTKIP_PCCMP_GTKIP
-	           || idx == IDX_RSN_PSK_PTKIP_PCCMP_GTKIP || idx == IDX_RSN_PSK_PCCMP_GCCMP)
-		return NM_SETTING_WIRELESS_SECURITY_ERROR;
-	else
-		g_assert_not_reached ();
-}
-
-static guint32
-error_code_for_idx (guint32 idx, guint num)
-{
-	if (idx == IDX_OPEN)
-		return NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY;
-	else if (idx == IDX_PRIV) {
-		if (num <= 3)
-			return NM_SETTING_802_1X_ERROR_MISSING_PROPERTY;
-		else
-			return NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY;
-	} else if (idx == IDX_WPA_PSK_PTKIP_GTKIP || idx == IDX_WPA_PSK_PTKIP_PCCMP_GTKIP
-	           || idx == IDX_WPA_RSN_PSK_PCCMP_GCCMP || idx == IDX_WPA_RSN_PSK_PTKIP_PCCMP_GTKIP
-	           || idx == IDX_RSN_PSK_PTKIP_PCCMP_GTKIP || idx == IDX_RSN_PSK_PCCMP_GCCMP)
-		return NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY;
-	else
-		g_assert_not_reached ();
-}
-
-static void
-test_ap_wpa_eap_connection_1 (guint32 idx)
-{
-	test_ap_wpa_eap_connection_base (NULL, NULL,
-	                                 flags_for_idx (idx),
-	                                 wpa_flags_for_idx (idx),
-	                                 rsn_flags_for_idx (idx),
-	                                 FALSE,
-	                                 error_domain_for_idx (idx, 1),
-	                                 error_code_for_idx (idx, 1));
-}
-
-static void
-test_ap_wpa_eap_connection_2 (guint idx)
-{
-	test_ap_wpa_eap_connection_base (NULL, NULL,
-	                                 flags_for_idx (idx),
-	                                 wpa_flags_for_idx (idx),
-	                                 rsn_flags_for_idx (idx),
-	                                 TRUE,
-	                                 error_domain_for_idx (idx, 2),
-	                                 error_code_for_idx (idx, 2));
-}
-
-static void
-test_ap_wpa_eap_connection_3 (guint idx)
-{
-	test_ap_wpa_eap_connection_base (NULL, "open",
-	                                 flags_for_idx (idx),
-	                                 wpa_flags_for_idx (idx),
-	                                 rsn_flags_for_idx (idx),
-	                                 FALSE,
-	                                 error_domain_for_idx (idx, 3),
-	                                 error_code_for_idx (idx, 3));
-}
-
-static void
-test_ap_wpa_eap_connection_4 (guint idx)
-{
-	test_ap_wpa_eap_connection_base (NULL, "shared",
-	                                 flags_for_idx (idx),
-	                                 wpa_flags_for_idx (idx),
-	                                 rsn_flags_for_idx (idx),
-	                                 FALSE,
-	                                 error_domain_for_idx (idx, 4),
-	                                 error_code_for_idx (idx, 4));
-}
-
-static void
-test_ap_wpa_eap_connection_5 (guint idx)
-{
-	test_ap_wpa_eap_connection_base ("wpa-eap", "open",
-	                                 flags_for_idx (idx),
-	                                 wpa_flags_for_idx (idx),
-	                                 rsn_flags_for_idx (idx),
-	                                 FALSE,
-	                                 error_domain_for_idx (idx, 5),
-	                                 error_code_for_idx (idx, 5));
-}
-
-/*******************************************/
-
-static void
-test_priv_ap_empty_connection (void)
-{
-	NMConnection *src, *expected;
-	const guint8 bssid[ETH_ALEN] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 };
-	const char *ssid = "blahblah";
-	const KeyData exp_wsec[] = {
-	    { NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "none", 0 },
-	    { NULL } };
-	gboolean success;
-	GError *error = NULL;
-
-	/* Test that an empty connection is completed to a valid Static WEP
-	 * connection when completed with an AP with the Privacy bit set.
-	 */
-
-	src = nm_connection_new ();
-	success = complete_connection (ssid, bssid,
-	                               NM_802_11_MODE_INFRA, NM_802_11_AP_FLAGS_PRIVACY,
-	                               NM_802_11_AP_SEC_NONE, NM_802_11_AP_SEC_NONE,
-	                               FALSE,
-	                               src, &error);
-
-	/* Static WEP connection expected */
-	expected = create_basic (ssid, NULL, NM_802_11_MODE_INFRA, TRUE);
-	fill_wsec (expected, exp_wsec);
-	COMPARE (src, expected, success, error, 0, 0);
-
-	g_object_unref (src);
-	g_object_unref (expected);
-}
-
-/*******************************************/
-
-static void
-test_priv_ap_leap_connection_1 (gboolean add_wifi)
-{
-	NMConnection *src, *expected;
-	const char *ssid = "blahblah";
-	const guint8 bssid[ETH_ALEN] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 };
-	const char *leap_username = "Bill Smith";
-	const KeyData src_wsec[] = {
-	    { NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "ieee8021x", 0 },
-	    { NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME, leap_username, 0 },
-	    { NULL } };
-	const KeyData exp_wsec[] = {
-	    { NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "ieee8021x", 0 },
-	    { NM_SETTING_WIRELESS_SECURITY_AUTH_ALG, "leap", 0 },
-	    { NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME, leap_username, 0 },
-	    { NULL } };
-	gboolean success;
-	GError *error = NULL;
-
-	/* Test that an minimal LEAP connection specifying only key management and
-	 * the LEAP username is completed to a full LEAP connection when completed
-	 * with an AP with the Privacy bit set.
-	 */
-
-	src = nm_connection_new ();
-	if (add_wifi)
-		fill_wifi_empty (src);
-	fill_wsec (src, src_wsec);
-	success = complete_connection (ssid, bssid,
-	                               NM_802_11_MODE_INFRA, NM_802_11_AP_FLAGS_PRIVACY,
-	                               NM_802_11_AP_SEC_NONE, NM_802_11_AP_SEC_NONE,
-	                               FALSE,
-	                               src, &error);
-	/* We expect success here; since LEAP APs just set the 'privacy' flag
-	 * there's no way to determine from the AP's beacon whether it's static WEP,
-	 * dynamic WEP, or LEAP.
-	 */
-	expected = create_basic (ssid, NULL, NM_802_11_MODE_INFRA, TRUE);
-	fill_wsec (expected, exp_wsec);
-	COMPARE (src, expected, success, error, 0, 0);
-
-	g_object_unref (src);
-}
-
-/*******************************************/
-
-static void
-test_priv_ap_leap_connection_2 (void)
-{
-	NMConnection *src;
-	const guint8 bssid[ETH_ALEN] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 };
-	const KeyData src_wsec[] = {
-	    { NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "ieee8021x", 0 },
-	    { NM_SETTING_WIRELESS_SECURITY_AUTH_ALG, "leap", 0 },
-	    { NULL } };
-	gboolean success;
-	GError *error = NULL;
-
-	/* Test that an minimal LEAP connection specifying only key management and
-	 * the LEAP auth alg is completed to a full LEAP connection when completed
-	 * with an AP with the Privacy bit set.
-	 */
-
-	src = nm_connection_new ();
-	fill_wifi_empty (src);
-	fill_wsec (src, src_wsec);
-	success = complete_connection ("blahblah", bssid,
-	                               NM_802_11_MODE_INFRA, NM_802_11_AP_FLAGS_PRIVACY,
-	                               NM_802_11_AP_SEC_NONE, NM_802_11_AP_SEC_NONE,
-	                               FALSE,
-	                               src, &error);
-	/* We expect failure here, we need a LEAP username */
-	COMPARE (src, NULL, success, error, NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_USERNAME);
-
-	g_object_unref (src);
-}
-
-/*******************************************/
-
-static void
-test_priv_ap_dynamic_wep_1 (void)
-{
-	NMConnection *src, *expected;
-	const char *ssid = "blahblah";
-	const guint8 bssid[ETH_ALEN] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 };
-	const KeyData src_wsec[] = {
-	    { NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "ieee8021x", 0 },
-	    { NM_SETTING_WIRELESS_SECURITY_AUTH_ALG, "open", 0 },
-	    { NULL } };
-	const KeyData both_8021x[] = {
-	    { NM_SETTING_802_1X_EAP, "peap", 0 },
-	    { NM_SETTING_802_1X_IDENTITY, "Bill Smith", 0 },
-	    { NM_SETTING_802_1X_PHASE2_AUTH, "mschapv2", 0 },
-	    { NULL } };
-	const KeyData exp_wsec[] = {
-	    { NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "ieee8021x", 0 },
-	    { NM_SETTING_WIRELESS_SECURITY_AUTH_ALG, "open", 0 },
-	    { NM_SETTING_WIRELESS_SECURITY_PAIRWISE, "wep40", 0 },
-	    { NM_SETTING_WIRELESS_SECURITY_PAIRWISE, "wep104", 0 },
-	    { NM_SETTING_WIRELESS_SECURITY_GROUP, "wep40", 0 },
-	    { NM_SETTING_WIRELESS_SECURITY_GROUP, "wep104", 0 },
-	    { NULL } };
-	gboolean success;
-	GError *error = NULL;
-
-	/* Test that an minimal Dynamic WEP connection specifying key management,
-	 * the auth algorithm, and valid 802.1x setting is completed to a valid
-	 * Dynamic WEP connection when completed with an AP with the Privacy bit set.
-	 */
-
-	src = nm_connection_new ();
-	fill_wifi_empty (src);
-	fill_wsec (src, src_wsec);
-	fill_8021x (src, both_8021x);
-	success = complete_connection (ssid, bssid,
-	                               NM_802_11_MODE_INFRA, NM_802_11_AP_FLAGS_PRIVACY,
-	                               NM_802_11_AP_SEC_NONE, NM_802_11_AP_SEC_NONE,
-	                               FALSE,
-	                               src, &error);
-
-	/* We expect a completed Dynamic WEP connection */
-	expected = create_basic (ssid, NULL, NM_802_11_MODE_INFRA, TRUE);
-	fill_wsec (expected, exp_wsec);
-	fill_8021x (expected, both_8021x);
-	COMPARE (src, expected, success, error, 0, 0);
-
-	g_object_unref (src);
-}
-
-/*******************************************/
-
-static void
-test_priv_ap_dynamic_wep_2 (void)
-{
-	NMConnection *src, *expected;
-	const char *ssid = "blahblah";
-	const guint8 bssid[ETH_ALEN] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 };
-	const KeyData src_wsec[] = {
-	    { NM_SETTING_WIRELESS_SECURITY_AUTH_ALG, "open", 0 },
-	    { NULL } };
-	const KeyData both_8021x[] = {
-	    { NM_SETTING_802_1X_EAP, "peap", 0 },
-	    { NM_SETTING_802_1X_IDENTITY, "Bill Smith", 0 },
-	    { NM_SETTING_802_1X_PHASE2_AUTH, "mschapv2", 0 },
-	    { NULL } };
-	const KeyData exp_wsec[] = {
-	    { NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "ieee8021x", 0 },
-	    { NM_SETTING_WIRELESS_SECURITY_AUTH_ALG, "open", 0 },
-	    { NM_SETTING_WIRELESS_SECURITY_PAIRWISE, "wep40", 0 },
-	    { NM_SETTING_WIRELESS_SECURITY_PAIRWISE, "wep104", 0 },
-	    { NM_SETTING_WIRELESS_SECURITY_GROUP, "wep40", 0 },
-	    { NM_SETTING_WIRELESS_SECURITY_GROUP, "wep104", 0 },
-	    { NULL } };
-	gboolean success;
-	GError *error = NULL;
-
-	/* Test that an minimal Dynamic WEP connection specifying only the auth
-	 * algorithm and a valid 802.1x setting is completed to a valid Dynamic
-	 * WEP connection when completed with an AP with the Privacy bit set.
-	 */
-
-	src = nm_connection_new ();
-	fill_wifi_empty (src);
-	fill_wsec (src, src_wsec);
-	fill_8021x (src, both_8021x);
-	success = complete_connection (ssid, bssid,
-	                               NM_802_11_MODE_INFRA, NM_802_11_AP_FLAGS_PRIVACY,
-	                               NM_802_11_AP_SEC_NONE, NM_802_11_AP_SEC_NONE,
-	                               FALSE,
-	                               src, &error);
-
-	/* We expect a completed Dynamic WEP connection */
-	expected = create_basic (ssid, NULL, NM_802_11_MODE_INFRA, TRUE);
-	fill_wsec (expected, exp_wsec);
-	fill_8021x (expected, both_8021x);
-	COMPARE (src, expected, success, error, 0, 0);
-
-	g_object_unref (src);
-}
-
-/*******************************************/
-
-static void
-test_priv_ap_dynamic_wep_3 (void)
-{
-	NMConnection *src;
-	const guint8 bssid[ETH_ALEN] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 };
-	const KeyData src_wsec[] = {
-	    { NM_SETTING_WIRELESS_SECURITY_AUTH_ALG, "shared", 0 },
-	    { NULL } };
-	const KeyData src_8021x[] = {
-	    { NM_SETTING_802_1X_EAP, "peap", 0 },
-	    { NM_SETTING_802_1X_IDENTITY, "Bill Smith", 0 },
-	    { NM_SETTING_802_1X_PHASE2_AUTH, "mschapv2", 0 },
-	    { NULL } };
-	gboolean success;
-	GError *error = NULL;
-
-	/* Ensure that a basic connection specifying 'shared' auth and an 802.1x
-	 * setting is rejected, as 802.1x is incompatible with 'shared' auth.
-	 */
-
-	src = nm_connection_new ();
-	fill_wifi_empty (src);
-	fill_wsec (src, src_wsec);
-	fill_8021x (src, src_8021x);
-	success = complete_connection ("blahblah", bssid,
-	                               NM_802_11_MODE_INFRA, NM_802_11_AP_FLAGS_PRIVACY,
-	                               NM_802_11_AP_SEC_NONE, NM_802_11_AP_SEC_NONE,
-	                               FALSE,
-	                               src, &error);
-	/* Expect failure; shared is not compatible with dynamic WEP */
-	COMPARE (src, NULL, success, error, NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY);
-
-	g_object_unref (src);
-}
-
-/*******************************************/
-
-static void
-test_priv_ap_wpa_psk_connection_1 (void)
-{
-	/* Test that a basic WPA-PSK connection is rejected when completion is
-	 * attempted with an AP with just the Privacy bit set.  Lack of WPA/RSN
-	 * flags means the AP provides Static/Dynamic WEP or LEAP, not WPA.
-	 */
-	test_ap_wpa_psk_connection_base (NULL, NULL,
-	                                 NM_802_11_AP_FLAGS_PRIVACY,
-	                                 NM_802_11_AP_SEC_NONE,
-	                                 NM_802_11_AP_SEC_NONE,
-	                                 FALSE, NULL);
-}
-
-static void
-test_priv_ap_wpa_psk_connection_2 (void)
-{
-	/* Test that a basic WPA-PSK connection is rejected when completion is
-	 * attempted with an AP with just the Privacy bit set.  Lack of WPA/RSN
-	 * flags means the AP provides Static/Dynamic WEP or LEAP, not WPA.
-	 */
-	test_ap_wpa_psk_connection_base (NULL, NULL,
-	                                 NM_802_11_AP_FLAGS_PRIVACY,
-	                                 NM_802_11_AP_SEC_NONE,
-	                                 NM_802_11_AP_SEC_NONE,
-	                                 TRUE, NULL);
-}
-
-static void
-test_priv_ap_wpa_psk_connection_3 (void)
-{
-	/* Test that a basic WPA-PSK connection specifying only the auth algorithm
-	 * is rejected when completion is attempted with an AP with just the Privacy
-	 * bit set.  Lack of WPA/RSN flags means the AP provides Static/Dynamic WEP
-	 * or LEAP, not WPA.
-	 */
-	test_ap_wpa_psk_connection_base (NULL, "open",
-	                                 NM_802_11_AP_FLAGS_PRIVACY,
-	                                 NM_802_11_AP_SEC_NONE,
-	                                 NM_802_11_AP_SEC_NONE,
-	                                 FALSE, NULL);
-}
-
-static void
-test_priv_ap_wpa_psk_connection_4 (void)
-{
-	/* Test that a basic WPA-PSK connection specifying only the auth algorithm
-	 * is rejected when completion is attempted with an AP with just the Privacy
-	 * bit set.  Lack of WPA/RSN flags means the AP provides Static/Dynamic WEP
-	 * or LEAP, not WPA.  Second, 'shared' auth is incompatible with WPA.
-	 */
-	test_ap_wpa_psk_connection_base (NULL, "shared",
-	                                 NM_802_11_AP_FLAGS_PRIVACY,
-	                                 NM_802_11_AP_SEC_NONE,
-	                                 NM_802_11_AP_SEC_NONE,
-	                                 FALSE, NULL);
-}
-
-static void
-test_priv_ap_wpa_psk_connection_5 (void)
-{
-	/* Test that a WPA-PSK connection specifying both the key management and
-	 * auth algorithm is rejected when completion is attempted with an AP with
-	 * just the Privacy bit set.  Lack of WPA/RSN flags means the AP provides
-	 * Static/Dynamic WEP or LEAP, not WPA.
-	 */
-	test_ap_wpa_psk_connection_base ("wpa-psk", "open",
-	                                 NM_802_11_AP_FLAGS_PRIVACY,
-	                                 NM_802_11_AP_SEC_NONE,
-	                                 NM_802_11_AP_SEC_NONE,
-	                                 FALSE, NULL);
-}
-
-/*******************************************/
-
-static void
-test_wpa_ap_empty_connection (guint idx)
-{
-	NMConnection *src, *expected;
-	const guint8 bssid[ETH_ALEN] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 };
-	const char *ssid = "blahblah";
-	const KeyData exp_wsec[] = {
-	    { NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "wpa-psk", 0 },
-	    { NM_SETTING_WIRELESS_SECURITY_AUTH_ALG, "open", 0 },
-	    { NULL } };
-	gboolean success;
-	GError *error = NULL;
-
-	/* Test that a basic WPA-PSK connection specifying just key management and
-	 * the auth algorithm is completed successfully when given an AP with WPA
-	 * or RSN flags.
-	 */
-
-	src = nm_connection_new ();
-	success = complete_connection (ssid, bssid,
-	                               NM_802_11_MODE_INFRA, NM_802_11_AP_FLAGS_PRIVACY,
-	                               wpa_flags_for_idx (idx),
-	                               rsn_flags_for_idx (idx),
-	                               FALSE, src, &error);
-
-	/* WPA connection expected */
-	expected = create_basic (ssid, NULL, NM_802_11_MODE_INFRA, TRUE);
-	fill_wsec (expected, exp_wsec);
-	COMPARE (src, expected, success, error, 0, 0);
-
-	g_object_unref (src);
-	g_object_unref (expected);
-}
-
-/*******************************************/
-
-static void
-test_wpa_ap_leap_connection_1 (guint idx)
-{
-	NMConnection *src;
-	const char *ssid = "blahblah";
-	const guint8 bssid[ETH_ALEN] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 };
-	const char *leap_username = "Bill Smith";
-	const KeyData src_wsec[] = {
-	    { NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "ieee8021x", 0 },
-	    { NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME, leap_username, 0 },
-	    { NULL } };
-	gboolean success;
-	GError *error = NULL;
-
-	/* Test that completion of a LEAP connection with a WPA-enabled AP is
-	 * rejected since WPA APs (usually) do not support LEAP.
-	 */
-
-	src = nm_connection_new ();
-	fill_wifi_empty (src);
-	fill_wsec (src, src_wsec);
-	success = complete_connection (ssid, bssid,
-	                               NM_802_11_MODE_INFRA, NM_802_11_AP_FLAGS_PRIVACY,
-	                               wpa_flags_for_idx (idx),
-	                               rsn_flags_for_idx (idx),
-	                               FALSE,
-	                               src, &error);
-	/* Expect failure here; WPA APs don't support old-school LEAP */
-	COMPARE (src, NULL, success, error, NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY);
-
-	g_object_unref (src);
-}
-
-/*******************************************/
-
-static void
-test_wpa_ap_leap_connection_2 (guint idx)
-{
-	NMConnection *src;
-	const guint8 bssid[ETH_ALEN] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 };
-	const KeyData src_wsec[] = {
-	    { NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "ieee8021x", 0 },
-	    { NM_SETTING_WIRELESS_SECURITY_AUTH_ALG, "leap", 0 },
-	    { NULL } };
-	gboolean success;
-	GError *error = NULL;
-
-	/* Test that completion of a LEAP connection with a WPA-enabled AP is
-	 * rejected since WPA APs (usually) do not support LEAP.
-	 */
-
-	src = nm_connection_new ();
-	fill_wifi_empty (src);
-	fill_wsec (src, src_wsec);
-	success = complete_connection ("blahblah", bssid,
-	                               NM_802_11_MODE_INFRA, NM_802_11_AP_FLAGS_PRIVACY,
-	                               wpa_flags_for_idx (idx),
-	                               rsn_flags_for_idx (idx),
-	                               FALSE,
-	                               src, &error);
-	/* We expect failure here, we need a LEAP username */
-	COMPARE (src, NULL, success, error, NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY);
-
-	g_object_unref (src);
-}
-
-/*******************************************/
-
-static void
-test_wpa_ap_dynamic_wep_connection (guint idx)
-{
-	NMConnection *src;
-	const guint8 bssid[ETH_ALEN] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 };
-	const KeyData src_wsec[] = {
-	    { NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "ieee8021x", 0 },
-	    { NULL } };
-	gboolean success;
-	GError *error = NULL;
-
-	/* Test that completion of a Dynamic WEP connection with a WPA-enabled AP is
-	 * rejected since WPA APs (usually) do not support Dynamic WEP.
-	 */
-
-	src = nm_connection_new ();
-	fill_wifi_empty (src);
-	fill_wsec (src, src_wsec);
-	success = complete_connection ("blahblah", bssid,
-	                               NM_802_11_MODE_INFRA, NM_802_11_AP_FLAGS_PRIVACY,
-	                               wpa_flags_for_idx (idx),
-	                               rsn_flags_for_idx (idx),
-	                               FALSE,
-	                               src, &error);
-	/* We expect failure here since Dynamic WEP is incompatible with WPA */
-	COMPARE (src, NULL, success, error, NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY);
-
-	g_object_unref (src);
-}
-
-/*******************************************/
-
-static void
-test_wpa_ap_wpa_psk_connection_1 (guint idx)
-{
-	NMConnection *expected;
-	const KeyData exp_wsec[] = {
-	    { NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "wpa-psk", 0 },
-	    { NM_SETTING_WIRELESS_SECURITY_AUTH_ALG, "open", 0 },
-	    { NULL } };
-
-	expected = nm_connection_new ();
-	fill_wsec (expected, exp_wsec);
-	test_ap_wpa_psk_connection_base (NULL, NULL,
-	                                 NM_802_11_AP_FLAGS_PRIVACY,
-	                                 wpa_flags_for_idx (idx),
-	                                 rsn_flags_for_idx (idx),
-	                                 FALSE, expected);
-	g_object_unref (expected);
-}
-
-static void
-test_wpa_ap_wpa_psk_connection_2 (guint idx)
-{
-	NMConnection *expected;
-	const KeyData exp_wsec[] = {
-	    { NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "wpa-psk", 0 },
-	    { NM_SETTING_WIRELESS_SECURITY_AUTH_ALG, "open", 0 },
-	    { NULL } };
-
-	expected = nm_connection_new ();
-	fill_wsec (expected, exp_wsec);
-	test_ap_wpa_psk_connection_base (NULL, NULL,
-	                                 NM_802_11_AP_FLAGS_PRIVACY,
-	                                 wpa_flags_for_idx (idx),
-	                                 rsn_flags_for_idx (idx),
-	                                 TRUE, expected);
-	g_object_unref (expected);
-}
-
-static void
-test_wpa_ap_wpa_psk_connection_3 (guint idx)
-{
-	NMConnection *expected;
-	const KeyData exp_wsec[] = {
-	    { NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "wpa-psk", 0 },
-	    { NM_SETTING_WIRELESS_SECURITY_AUTH_ALG, "open", 0 },
-	    { NULL } };
-
-	expected = nm_connection_new ();
-	fill_wsec (expected, exp_wsec);
-	test_ap_wpa_psk_connection_base (NULL, "open",
-	                                 NM_802_11_AP_FLAGS_PRIVACY,
-	                                 wpa_flags_for_idx (idx),
-	                                 rsn_flags_for_idx (idx),
-	                                 FALSE, expected);
-	g_object_unref (expected);
-}
-
-static void
-test_wpa_ap_wpa_psk_connection_4 (guint idx)
-{
-	test_ap_wpa_psk_connection_base (NULL, "shared",
-	                                 NM_802_11_AP_FLAGS_PRIVACY,
-	                                 wpa_flags_for_idx (idx),
-	                                 rsn_flags_for_idx (idx),
-	                                 FALSE, NULL);
-}
-
-static void
-test_wpa_ap_wpa_psk_connection_5 (guint idx)
-{
-	NMConnection *expected;
-	const KeyData exp_wsec[] = {
-	    { NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "wpa-psk", 0 },
-	    { NM_SETTING_WIRELESS_SECURITY_AUTH_ALG, "open", 0 },
-	    { NULL } };
-
-	expected = nm_connection_new ();
-	fill_wsec (expected, exp_wsec);
-	test_ap_wpa_psk_connection_base ("wpa-psk", "open",
-	                                 NM_802_11_AP_FLAGS_PRIVACY,
-	                                 wpa_flags_for_idx (idx),
-	                                 rsn_flags_for_idx (idx),
-	                                 FALSE, expected);
-	g_object_unref (expected);
-}
-
-/*******************************************/
-
-static void
-test_strength_dbm (void)
-{
-	/* boundary conditions first */
-	g_assert_cmpint (nm_ap_utils_level_to_quality (-1), ==, 100);
-	g_assert_cmpint (nm_ap_utils_level_to_quality (-40), ==, 100);
-	g_assert_cmpint (nm_ap_utils_level_to_quality (-30), ==, 100);
-	g_assert_cmpint (nm_ap_utils_level_to_quality (-100), ==, 0);
-	g_assert_cmpint (nm_ap_utils_level_to_quality (-200), ==, 0);
-
-	g_assert_cmpint (nm_ap_utils_level_to_quality (-81), ==, 32);
-	g_assert_cmpint (nm_ap_utils_level_to_quality (-92), ==, 14);
-	g_assert_cmpint (nm_ap_utils_level_to_quality (-74), ==, 44);
-	g_assert_cmpint (nm_ap_utils_level_to_quality (-81), ==, 32);
-	g_assert_cmpint (nm_ap_utils_level_to_quality (-66), ==, 57);
-}
-
-static void
-test_strength_percent (void)
-{
-	int i;
-
-	/* boundary conditions first */
-	g_assert_cmpint (nm_ap_utils_level_to_quality (0), ==, 0);
-	g_assert_cmpint (nm_ap_utils_level_to_quality (100), ==, 100);
-	g_assert_cmpint (nm_ap_utils_level_to_quality (110), ==, 100);
-
-	for (i = 0; i <= 100; i++)
-		g_assert_cmpint (nm_ap_utils_level_to_quality (i), ==, i);
-}
-
-static void
-test_strength_wext (void)
-{
-	/* boundary conditions that we assume aren't WEXT first */
-	g_assert_cmpint (nm_ap_utils_level_to_quality (256), ==, 100);
-	g_assert_cmpint (nm_ap_utils_level_to_quality (110), ==, 100);
-
-	/* boundary conditions that we assume are WEXT */
-	g_assert_cmpint (nm_ap_utils_level_to_quality (111), ==, 0);
-	g_assert_cmpint (nm_ap_utils_level_to_quality (150), ==, 0);
-	g_assert_cmpint (nm_ap_utils_level_to_quality (225), ==, 100);
-	g_assert_cmpint (nm_ap_utils_level_to_quality (255), ==, 100);
-
-	g_assert_cmpint (nm_ap_utils_level_to_quality (157), ==, 2);
-	g_assert_cmpint (nm_ap_utils_level_to_quality (200), ==, 74);
-	g_assert_cmpint (nm_ap_utils_level_to_quality (215), ==, 99);
-}
-
-/*******************************************/
-
-#if GLIB_CHECK_VERSION(2,25,12)
-typedef GTestFixtureFunc TCFunc;
-#else
-typedef void (*TCFunc)(void);
-#endif
-
-#define TESTCASE(t, d) g_test_create_case (#t, 0, (gconstpointer) d, NULL, (TCFunc) t, NULL)
-
-int main (int argc, char **argv)
-{
-	GTestSuite *suite;
-	gsize i;
-
-	g_type_init ();
-	g_test_init (&argc, &argv, NULL);
-
-	suite = g_test_get_root ();
-
-	g_test_suite_add (suite, TESTCASE (test_lock_bssid, NULL));
-
-	/* Open AP tests; make sure that connections to be completed that have
-	 * various security-related settings already set cause the completion
-	 * to fail.
-	 */
-	g_test_suite_add (suite, TESTCASE (test_open_ap_empty_connection, NULL));
-	g_test_suite_add (suite, TESTCASE (test_open_ap_leap_connection_1, TRUE));
-	g_test_suite_add (suite, TESTCASE (test_open_ap_leap_connection_1, FALSE));
-	g_test_suite_add (suite, TESTCASE (test_open_ap_leap_connection_2, NULL));
-	g_test_suite_add (suite, TESTCASE (test_open_ap_wep_connection, TRUE));
-	g_test_suite_add (suite, TESTCASE (test_open_ap_wep_connection, FALSE));
-
-	g_test_suite_add (suite, TESTCASE (test_open_ap_wpa_psk_connection_1, NULL));
-	g_test_suite_add (suite, TESTCASE (test_open_ap_wpa_psk_connection_2, NULL));
-	g_test_suite_add (suite, TESTCASE (test_open_ap_wpa_psk_connection_3, NULL));
-	g_test_suite_add (suite, TESTCASE (test_open_ap_wpa_psk_connection_4, NULL));
-	g_test_suite_add (suite, TESTCASE (test_open_ap_wpa_psk_connection_5, NULL));
-
-	g_test_suite_add (suite, TESTCASE (test_ap_wpa_eap_connection_1, IDX_OPEN));
-	g_test_suite_add (suite, TESTCASE (test_ap_wpa_eap_connection_2, IDX_OPEN));
-	g_test_suite_add (suite, TESTCASE (test_ap_wpa_eap_connection_3, IDX_OPEN));
-	g_test_suite_add (suite, TESTCASE (test_ap_wpa_eap_connection_4, IDX_OPEN));
-	g_test_suite_add (suite, TESTCASE (test_ap_wpa_eap_connection_5, IDX_OPEN));
-
-	/* WEP AP tests */
-	g_test_suite_add (suite, TESTCASE (test_priv_ap_empty_connection, NULL));
-	g_test_suite_add (suite, TESTCASE (test_priv_ap_leap_connection_1, FALSE));
-	g_test_suite_add (suite, TESTCASE (test_priv_ap_leap_connection_2, FALSE));
-
-	g_test_suite_add (suite, TESTCASE (test_priv_ap_dynamic_wep_1, NULL));
-	g_test_suite_add (suite, TESTCASE (test_priv_ap_dynamic_wep_2, NULL));
-	g_test_suite_add (suite, TESTCASE (test_priv_ap_dynamic_wep_3, NULL));
-
-	g_test_suite_add (suite, TESTCASE (test_priv_ap_wpa_psk_connection_1, NULL));
-	g_test_suite_add (suite, TESTCASE (test_priv_ap_wpa_psk_connection_2, NULL));
-	g_test_suite_add (suite, TESTCASE (test_priv_ap_wpa_psk_connection_3, NULL));
-	g_test_suite_add (suite, TESTCASE (test_priv_ap_wpa_psk_connection_4, NULL));
-	g_test_suite_add (suite, TESTCASE (test_priv_ap_wpa_psk_connection_5, NULL));
-
-	g_test_suite_add (suite, TESTCASE (test_ap_wpa_eap_connection_1, IDX_PRIV));
-	g_test_suite_add (suite, TESTCASE (test_ap_wpa_eap_connection_2, IDX_PRIV));
-	g_test_suite_add (suite, TESTCASE (test_ap_wpa_eap_connection_3, IDX_PRIV));
-	g_test_suite_add (suite, TESTCASE (test_ap_wpa_eap_connection_4, IDX_PRIV));
-	g_test_suite_add (suite, TESTCASE (test_ap_wpa_eap_connection_5, IDX_PRIV));
-
-	/* WPA-PSK tests */
-	for (i = IDX_WPA_PSK_PTKIP_GTKIP; i <= IDX_WPA_RSN_PSK_PCCMP_GCCMP; i++) {
-		g_test_suite_add (suite, TESTCASE (test_wpa_ap_empty_connection, i));
-		g_test_suite_add (suite, TESTCASE (test_wpa_ap_leap_connection_1, i));
-		g_test_suite_add (suite, TESTCASE (test_wpa_ap_leap_connection_2, i));
-
-		g_test_suite_add (suite, TESTCASE (test_wpa_ap_dynamic_wep_connection, i));
-
-		g_test_suite_add (suite, TESTCASE (test_wpa_ap_wpa_psk_connection_1, i));
-		g_test_suite_add (suite, TESTCASE (test_wpa_ap_wpa_psk_connection_2, i));
-		g_test_suite_add (suite, TESTCASE (test_wpa_ap_wpa_psk_connection_3, i));
-		g_test_suite_add (suite, TESTCASE (test_wpa_ap_wpa_psk_connection_4, i));
-		g_test_suite_add (suite, TESTCASE (test_wpa_ap_wpa_psk_connection_5, i));
-
-		g_test_suite_add (suite, TESTCASE (test_ap_wpa_eap_connection_1, i));
-		g_test_suite_add (suite, TESTCASE (test_ap_wpa_eap_connection_2, i));
-		g_test_suite_add (suite, TESTCASE (test_ap_wpa_eap_connection_3, i));
-		g_test_suite_add (suite, TESTCASE (test_ap_wpa_eap_connection_4, i));
-		g_test_suite_add (suite, TESTCASE (test_ap_wpa_eap_connection_5, i));
-	}
-
-	/* RSN-PSK tests */
-	for (i = IDX_WPA_RSN_PSK_PTKIP_PCCMP_GTKIP; i <= IDX_RSN_PSK_PTKIP_PCCMP_GTKIP; i++) {
-		g_test_suite_add (suite, TESTCASE (test_wpa_ap_empty_connection, i));
-		g_test_suite_add (suite, TESTCASE (test_wpa_ap_leap_connection_1, i));
-		g_test_suite_add (suite, TESTCASE (test_wpa_ap_leap_connection_2, i));
-
-		g_test_suite_add (suite, TESTCASE (test_wpa_ap_dynamic_wep_connection, i));
-
-		g_test_suite_add (suite, TESTCASE (test_wpa_ap_wpa_psk_connection_1, i));
-		g_test_suite_add (suite, TESTCASE (test_wpa_ap_wpa_psk_connection_2, i));
-		g_test_suite_add (suite, TESTCASE (test_wpa_ap_wpa_psk_connection_3, i));
-		g_test_suite_add (suite, TESTCASE (test_wpa_ap_wpa_psk_connection_4, i));
-		g_test_suite_add (suite, TESTCASE (test_wpa_ap_wpa_psk_connection_5, i));
-
-		g_test_suite_add (suite, TESTCASE (test_ap_wpa_eap_connection_1, i));
-		g_test_suite_add (suite, TESTCASE (test_ap_wpa_eap_connection_2, i));
-		g_test_suite_add (suite, TESTCASE (test_ap_wpa_eap_connection_3, i));
-		g_test_suite_add (suite, TESTCASE (test_ap_wpa_eap_connection_4, i));
-		g_test_suite_add (suite, TESTCASE (test_ap_wpa_eap_connection_5, i));
-	}
-
-	/* Scanned signal strength conversion tests */
-	g_test_suite_add (suite, TESTCASE (test_strength_dbm, NULL));
-	g_test_suite_add (suite, TESTCASE (test_strength_percent, NULL));
-	g_test_suite_add (suite, TESTCASE (test_strength_wext, NULL));
-
-	return g_test_run ();
-}
-