Imported Upstream version 1.1.91 upstream/1.1.91

5 files changed, 68 insertions, 290 deletions

diff --git a/src/settings/plugins/ifupdown/interface_parser.c b/src/settings/plugins/ifupdown/interface_parser.c
index 4606f5ab..be7d387d 100644
--- a/src/settings/plugins/ifupdown/interface_parser.c
+++ b/src/settings/plugins/ifupdown/interface_parser.c
@@ -20,16 +20,17 @@
  * (C) Copyright 2004 Tom Parker
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include "interface_parser.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <wordexp.h>
 #include <libgen.h>
+
 #include "nm-utils.h"
-#include "nm-default.h"
 
 if_block* first;
 if_block* last;
diff --git a/src/settings/plugins/ifupdown/nm-ifupdown-connection.c b/src/settings/plugins/ifupdown/nm-ifupdown-connection.c
index 2c8504b0..19de1db6 100644
--- a/src/settings/plugins/ifupdown/nm-ifupdown-connection.c
+++ b/src/settings/plugins/ifupdown/nm-ifupdown-connection.c
@@ -21,16 +21,16 @@
  * (C) Copyright 2007,2008 Canonical Ltd.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <string.h>
 #include <glib/gstdio.h>
-#include <nm-dbus-interface.h>
-#include <nm-utils.h>
-#include <nm-setting-wireless-security.h>
-#include <nm-settings-connection.h>
-#include <nm-settings-plugin.h>
-#include "nm-default.h"
+
+#include "nm-dbus-interface.h"
+#include "nm-utils.h"
+#include "nm-setting-wireless-security.h"
+#include "nm-settings-connection.h"
+#include "nm-settings-plugin.h"
 #include "nm-ifupdown-connection.h"
 #include "parser.h"
 
diff --git a/src/settings/plugins/ifupdown/parser.c b/src/settings/plugins/ifupdown/parser.c
index 8a3d4551..bd200cd5 100644
--- a/src/settings/plugins/ifupdown/parser.c
+++ b/src/settings/plugins/ifupdown/parser.c
@@ -21,7 +21,7 @@
  * (C) Copyright 2008 Canonical Ltd.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <string.h>
 #include <arpa/inet.h>
@@ -31,7 +31,6 @@
 
 #include "nm-core-internal.h"
 #include "nm-settings-plugin.h"
-#include "nm-default.h"
 
 #include "parser.h"
 #include "plugin.h"
diff --git a/src/settings/plugins/ifupdown/plugin.c b/src/settings/plugins/ifupdown/plugin.c
index fc361de5..dbc96eac 100644
--- a/src/settings/plugins/ifupdown/plugin.c
+++ b/src/settings/plugins/ifupdown/plugin.c
@@ -22,14 +22,15 @@
  * (C) Copyright 2009 - 2011 Red Hat, Inc.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <string.h>
-
+#include <arpa/inet.h>
+#include <gudev/gudev.h>
 #include <gmodule.h>
-#include <nm-setting-connection.h>
 
-#include "nm-default.h"
+#include "nm-setting-connection.h"
+
 #include "interface_parser.h"
 
 #include "nm-dbus-interface.h"
@@ -48,10 +49,6 @@
 
 #include "nm-config.h"
 
-#include <arpa/inet.h>
-
-#include <gudev/gudev.h>
-
 #define ENI_INTERFACES_FILE "/etc/network/interfaces"
 
 #define IFUPDOWN_PLUGIN_NAME "ifupdown"
diff --git a/src/settings/plugins/ifupdown/tests/test-ifupdown.c b/src/settings/plugins/ifupdown/tests/test-ifupdown.c
index 24e8afdc..f383821c 100644
--- a/src/settings/plugins/ifupdown/tests/test-ifupdown.c
+++ b/src/settings/plugins/ifupdown/tests/test-ifupdown.c
@@ -18,11 +18,10 @@
  *
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <string.h>
 
-#include "nm-default.h"
 #include "nm-core-internal.h"
 #include "interface_parser.h"
 #include "parser.h"
@@ -462,145 +461,50 @@ test17_read_static_ipv4 (const char *path)
 	NMSettingConnection *s_con;
 	NMSettingIPConfig *s_ip4;
 	NMSettingWired *s_wired;
-	char *unmanaged = NULL;
 	GError *error = NULL;
-	const char* tmp;
-	const char *expected_id = "Ifupdown (eth0)";
-	const char *expected_search1 = "example.com";
-	const char *expected_search2 = "foo.example.com";
+	gboolean success;
 	NMIPAddress *ip4_addr;
-#define TEST17_NAME "wired-static-verify-ip4"
 	if_block *block = NULL;
 
-	const char* file = "test17-" TEST17_NAME;
-
-	init_ifparser_with_file (path, file);
+	init_ifparser_with_file (path, "test17-wired-static-verify-ip4");
 	block = ifparser_getfirst ();
 	connection = nm_simple_connection_new();
-	ifupdown_update_connection_from_if_block(connection, block, &error);
-
-	ASSERT (connection != NULL,
-			TEST17_NAME, "failed to read %s: %s", file, error->message);
+	g_assert (connection);
 
-	ASSERT (nm_connection_verify (connection, &error),
-			TEST17_NAME, "failed to verify %s: %s", file, error->message);
+	ifupdown_update_connection_from_if_block(connection, block, &error);
+	g_assert_no_error (error);
 
-	ASSERT (unmanaged == NULL,
-			TEST17_NAME, "failed to verify %s: unexpected unmanaged value", file);
+	success = nm_connection_verify (connection, &error);
+	g_assert_no_error (error);
+	g_assert (success);
 
 	/* ===== CONNECTION SETTING ===== */
-
 	s_con = nm_connection_get_setting_connection (connection);
-	ASSERT (s_con != NULL,
-			TEST17_NAME, "failed to verify %s: missing %s setting",
-			file,
-			NM_SETTING_CONNECTION_SETTING_NAME);
-
-	/* ID */
-	tmp = nm_setting_connection_get_id (s_con);
-	ASSERT (tmp != NULL,
-			TEST17_NAME, "failed to verify %s: missing %s / %s key",
-			file,
-			NM_SETTING_CONNECTION_SETTING_NAME,
-			NM_SETTING_CONNECTION_ID);
-	ASSERT (strcmp (tmp, expected_id) == 0,
-			TEST17_NAME, "failed to verify %s: unexpected %s / %s key value: %s",
-			file,
-			NM_SETTING_CONNECTION_SETTING_NAME,
-			NM_SETTING_CONNECTION_ID, tmp);
+	g_assert (s_con);
+	g_assert_cmpstr (nm_setting_connection_get_id (s_con), ==, "Ifupdown (eth0)");
 
 	/* ===== WIRED SETTING ===== */
-
 	s_wired = nm_connection_get_setting_wired (connection);
-	ASSERT (s_wired != NULL,
-			TEST17_NAME, "failed to verify %s: missing %s setting",
-			file,
-			NM_SETTING_WIRED_SETTING_NAME);
+	g_assert (s_wired);
 
 	/* ===== IPv4 SETTING ===== */
-
 	s_ip4 = nm_connection_get_setting_ip4_config (connection);
-	ASSERT (s_ip4 != NULL,
-			TEST17_NAME, "failed to verify %s: missing %s setting",
-			file,
-			NM_SETTING_IP4_CONFIG_SETTING_NAME);
-
-	/* Method */
-	tmp = nm_setting_ip_config_get_method (s_ip4);
-	ASSERT (strcmp (tmp, NM_SETTING_IP4_CONFIG_METHOD_MANUAL) == 0,
-			TEST17_NAME, "failed to verify %s: unexpected %s / %s key value",
-			file,
-			NM_SETTING_IP4_CONFIG_SETTING_NAME,
-			NM_SETTING_IP_CONFIG_METHOD);
-
-	/* IP addresses */
-	ASSERT (nm_setting_ip_config_get_num_addresses (s_ip4) == 1,
-			TEST17_NAME, "failed to verify %s: unexpected %s / %s key value",
-			file,
-			NM_SETTING_IP4_CONFIG_SETTING_NAME,
-			NM_SETTING_IP_CONFIG_ADDRESSES);
+	g_assert (s_ip4);
+	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_MANUAL);
 
+	g_assert_cmpint (nm_setting_ip_config_get_num_addresses (s_ip4), ==, 1);
 	ip4_addr = nm_setting_ip_config_get_address (s_ip4, 0);
 	g_assert (ip4_addr != NULL);
 	g_assert_cmpstr (nm_ip_address_get_address (ip4_addr), ==, "10.0.0.3");
 	g_assert_cmpint (nm_ip_address_get_prefix (ip4_addr), ==, 8);
 
-	/* DNS Addresses */
-	ASSERT (nm_setting_ip_config_get_num_dns (s_ip4) == 2,
-			TEST17_NAME, "failed to verify %s: unexpected %s / %s key value",
-			file,
-			NM_SETTING_IP4_CONFIG_SETTING_NAME,
-			NM_SETTING_IP_CONFIG_DNS);
-
-	ASSERT (!strcmp (nm_setting_ip_config_get_dns (s_ip4, 0), "10.0.0.1"),
-			TEST17_NAME, "failed to verify %s: unexpected %s / %s key value #1",
-			file,
-			NM_SETTING_IP4_CONFIG_SETTING_NAME,
-			NM_SETTING_IP_CONFIG_DNS);
-
-	ASSERT (!strcmp (nm_setting_ip_config_get_dns (s_ip4, 1), "10.0.0.2"),
-			TEST17_NAME, "failed to verify %s: unexpected %s / %s key value #2",
-			file,
-			NM_SETTING_IP4_CONFIG_SETTING_NAME,
-			NM_SETTING_IP_CONFIG_DNS);
-
-	ASSERT (nm_setting_ip_config_get_num_addresses (s_ip4) == 1,
-			TEST17_NAME, "failed to verify %s: unexpected %s / %s key value",
-			file,
-			NM_SETTING_IP4_CONFIG_SETTING_NAME,
-			NM_SETTING_IP_CONFIG_DNS);
-
-	/* DNS search domains */
-	ASSERT (nm_setting_ip_config_get_num_dns_searches (s_ip4) == 2,
-			TEST17_NAME, "failed to verify %s: unexpected %s / %s key value",
-			file,
-			NM_SETTING_IP4_CONFIG_SETTING_NAME,
-			NM_SETTING_IP_CONFIG_DNS);
-
-	tmp = nm_setting_ip_config_get_dns_search (s_ip4, 0);
-	ASSERT (tmp != NULL,
-			TEST17_NAME, "failed to verify %s: missing %s / %s key",
-			file,
-			NM_SETTING_IP4_CONFIG_SETTING_NAME,
-			NM_SETTING_IP_CONFIG_DNS_SEARCH);
-	ASSERT (strcmp (tmp, expected_search1) == 0,
-			TEST17_NAME, "failed to verify %s: unexpected %s / %s key value",
-			file,
-			NM_SETTING_IP4_CONFIG_SETTING_NAME,
-			NM_SETTING_IP_CONFIG_DNS_SEARCH);
-
-	tmp = nm_setting_ip_config_get_dns_search (s_ip4, 1);
-	ASSERT (tmp != NULL,
-			TEST17_NAME, "failed to verify %s: missing %s / %s key",
-			file,
-			NM_SETTING_IP4_CONFIG_SETTING_NAME,
-			NM_SETTING_IP_CONFIG_DNS_SEARCH);
-
-	ASSERT (strcmp (tmp, expected_search2) == 0,
-			TEST17_NAME, "failed to verify %s: unexpected %s / %s key value",
-			file,
-			NM_SETTING_IP4_CONFIG_SETTING_NAME,
-			NM_SETTING_IP_CONFIG_DNS_SEARCH);
+	g_assert_cmpint (nm_setting_ip_config_get_num_dns (s_ip4), ==, 2);
+	g_assert_cmpstr (nm_setting_ip_config_get_dns (s_ip4, 0), ==, "10.0.0.1");
+	g_assert_cmpstr (nm_setting_ip_config_get_dns (s_ip4, 1), ==, "10.0.0.2");
+
+	g_assert_cmpint (nm_setting_ip_config_get_num_dns_searches (s_ip4), ==, 2);
+	g_assert_cmpstr (nm_setting_ip_config_get_dns_search (s_ip4, 0), ==, "example.com");
+	g_assert_cmpstr (nm_setting_ip_config_get_dns_search (s_ip4, 1), ==, "foo.example.com");
 
 	g_object_unref (connection);
 }
@@ -612,157 +516,50 @@ test18_read_static_ipv6 (const char *path)
 	NMSettingConnection *s_con;
 	NMSettingIPConfig *s_ip6;
 	NMSettingWired *s_wired;
-	char *unmanaged = NULL;
 	GError *error = NULL;
-	const char* tmp;
-	const char *expected_id = "Ifupdown (myip6tunnel)";
-	const char *expected_search1 = "example.com";
-	const char *expected_search2 = "foo.example.com";
+	gboolean success;
 	NMIPAddress *ip6_addr;
 	if_block *block = NULL;
-#define TEST18_NAME "wired-static-verify-ip6"
-	const char* file = "test18-" TEST18_NAME;
 
-	init_ifparser_with_file (path, file);
+	init_ifparser_with_file (path, "test18-wired-static-verify-ip6");
 	block = ifparser_getfirst ();
 	connection = nm_simple_connection_new();
+	g_assert (connection);
 	ifupdown_update_connection_from_if_block(connection, block, &error);
+	g_assert_no_error (error);
 
-	ASSERT (connection != NULL,
-			TEST18_NAME
-			"failed to read %s: %s", file, error->message);
-
-	ASSERT (nm_connection_verify (connection, &error),
-			TEST18_NAME,
-			"failed to verify %s: %s", file, error->message);
-
-	ASSERT (unmanaged == NULL,
-			TEST18_NAME,
-			"failed to verify %s: unexpected unmanaged value", file);
+	success = nm_connection_verify (connection, &error);
+	g_assert_no_error (error);
+	g_assert (success);
 
 	/* ===== CONNECTION SETTING ===== */
-
 	s_con = nm_connection_get_setting_connection (connection);
-	ASSERT (s_con != NULL,
-			TEST18_NAME, "failed to verify %s: missing %s setting",
-			file,
-			NM_SETTING_CONNECTION_SETTING_NAME);
-
-	/* ID */
-	tmp = nm_setting_connection_get_id (s_con);
-	ASSERT (tmp != NULL,
-			TEST18_NAME,
-			"failed to verify %s: missing %s / %s key",
-			file,
-			NM_SETTING_CONNECTION_SETTING_NAME,
-			NM_SETTING_CONNECTION_ID);
-
-	ASSERT (strcmp (tmp, expected_id) == 0,
-			TEST18_NAME,
-			"failed to verify %s: unexpected %s / %s key value",
-			file,
-			NM_SETTING_CONNECTION_SETTING_NAME,
-			NM_SETTING_CONNECTION_ID);
+	g_assert (s_con);
+	g_assert_cmpstr (nm_setting_connection_get_id (s_con), ==, "Ifupdown (myip6tunnel)");
 
 	/* ===== WIRED SETTING ===== */
-
 	s_wired = nm_connection_get_setting_wired (connection);
-	ASSERT (s_wired != NULL,
-			TEST18_NAME, "failed to verify %s: missing %s setting",
-			file,
-			NM_SETTING_WIRED_SETTING_NAME);
+	g_assert (s_wired);
 
 	/* ===== IPv6 SETTING ===== */
-
 	s_ip6 = nm_connection_get_setting_ip6_config (connection);
-	ASSERT (s_ip6 != NULL,
-			TEST18_NAME,
-			"failed to verify %s: missing %s setting",
-			file,
-			NM_SETTING_IP6_CONFIG_SETTING_NAME);
-
-	/* Method */
-	tmp = nm_setting_ip_config_get_method (s_ip6);
-	ASSERT (strcmp (tmp, NM_SETTING_IP6_CONFIG_METHOD_MANUAL) == 0,
-			TEST18_NAME,
-			"failed to verify %s: unexpected %s / %s key value",
-			file,
-			NM_SETTING_IP6_CONFIG_SETTING_NAME,
-			NM_SETTING_IP_CONFIG_METHOD);
-
-	/* IP addresses */
-	ASSERT (nm_setting_ip_config_get_num_addresses (s_ip6) == 1,
-			TEST18_NAME,
-			"failed to verify %s: unexpected number of %s / %s",
-			file,
-			NM_SETTING_IP6_CONFIG_SETTING_NAME,
-			NM_SETTING_IP_CONFIG_ADDRESSES);
+	g_assert (s_ip6);
+	g_assert_cmpstr (nm_setting_ip_config_get_method (s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_MANUAL);
 
+	g_assert_cmpint (nm_setting_ip_config_get_num_addresses (s_ip6), ==, 1);
 	ip6_addr = nm_setting_ip_config_get_address (s_ip6, 0);
 	g_assert (ip6_addr != NULL);
 	g_assert_cmpstr (nm_ip_address_get_address (ip6_addr), ==, "fc00::1");
 	g_assert_cmpint (nm_ip_address_get_prefix (ip6_addr), ==, 64);
 
-	/* DNS Addresses */
-	ASSERT (nm_setting_ip_config_get_num_dns (s_ip6) == 2,
-			TEST18_NAME,
-			"failed to verify %s: unexpected number of %s / %s values",
-			file,
-			NM_SETTING_IP6_CONFIG_SETTING_NAME,
-			NM_SETTING_IP_CONFIG_DNS);
-
-	ASSERT (!strcmp (nm_setting_ip_config_get_dns (s_ip6, 0), "fc00::2"),
-			TEST18_NAME,
-			"failed to verify %s: unexpected %s / %s #1",
-			file,
-			NM_SETTING_IP6_CONFIG_SETTING_NAME,
-			NM_SETTING_IP_CONFIG_DNS);
-
-	ASSERT (!strcmp (nm_setting_ip_config_get_dns (s_ip6, 1), "fc00::3"),
-			TEST18_NAME, "failed to verify %s: unexpected %s / %s #2",
-			file,
-			NM_SETTING_IP6_CONFIG_SETTING_NAME,
-			NM_SETTING_IP_CONFIG_DNS);
-
-	/* DNS search domains */
-	ASSERT (nm_setting_ip_config_get_num_dns_searches (s_ip6) == 2,
-			TEST18_NAME,
-			"failed to verify %s: unexpected number of %s / %s values",
-			file,
-			NM_SETTING_IP6_CONFIG_SETTING_NAME,
-			NM_SETTING_IP_CONFIG_DNS_SEARCH);
-
-	tmp = nm_setting_ip_config_get_dns_search (s_ip6, 0);
-	ASSERT (tmp != NULL,
-			"wired-ipv6-manual-verify-ip6",
-			"failed to verify %s: missing %s / %s #1",
-			file,
-			NM_SETTING_IP6_CONFIG_SETTING_NAME,
-			NM_SETTING_IP_CONFIG_DNS_SEARCH);
-
-	ASSERT (strcmp (tmp, expected_search1) == 0,
-			"wired-ipv6-manual-verify-ip6",
-			"failed to verify %s: unexpected %s / %s #1",
-			file,
-			NM_SETTING_IP6_CONFIG_SETTING_NAME,
-			NM_SETTING_IP_CONFIG_DNS_SEARCH);
-
-	tmp = nm_setting_ip_config_get_dns_search (s_ip6, 1);
-	ASSERT (tmp != NULL,
-			TEST18_NAME,
-			"failed to verify %s: missing %s / %s #2",
-			file,
-			NM_SETTING_IP6_CONFIG_SETTING_NAME,
-			NM_SETTING_IP_CONFIG_DNS_SEARCH);
-
-	ASSERT (strcmp (tmp, expected_search2) == 0,
-			TEST18_NAME,
-			"failed to verify %s: unexpected %s / %s #2",
-			file,
-			NM_SETTING_IP6_CONFIG_SETTING_NAME,
-			NM_SETTING_IP_CONFIG_DNS_SEARCH);
-
-	g_free (unmanaged);
+	g_assert_cmpint (nm_setting_ip_config_get_num_dns (s_ip6), ==, 2);
+	g_assert_cmpstr (nm_setting_ip_config_get_dns (s_ip6, 0), ==, "fc00::2");
+	g_assert_cmpstr (nm_setting_ip_config_get_dns (s_ip6, 1), ==, "fc00::3");
+
+	g_assert_cmpint (nm_setting_ip_config_get_num_dns_searches (s_ip6), ==, 2);
+	g_assert_cmpstr (nm_setting_ip_config_get_dns_search (s_ip6, 0), ==, "example.com");
+	g_assert_cmpstr (nm_setting_ip_config_get_dns_search (s_ip6, 1), ==, "foo.example.com");
+
 	g_object_unref (connection);
 }
 
@@ -771,43 +568,27 @@ test19_read_static_ipv4_plen (const char *path)
 {
 	NMConnection *connection;
 	NMSettingIPConfig *s_ip4;
-	char *unmanaged = NULL;
 	GError *error = NULL;
 	NMIPAddress *ip4_addr;
-#define TEST19_NAME "wired-static-verify-ip4-plen"
 	if_block *block = NULL;
+	gboolean success;
 
-	const char* file = "test19-" TEST19_NAME;
-
-	init_ifparser_with_file (path, file);
+	init_ifparser_with_file (path, "test19-wired-static-verify-ip4-plen");
 	block = ifparser_getfirst ();
 	connection = nm_simple_connection_new();
+	g_assert (connection);
 	ifupdown_update_connection_from_if_block(connection, block, &error);
+	g_assert_no_error (error);
 
-	ASSERT (connection != NULL,
-			TEST19_NAME, "failed to read %s: %s", file, error->message);
-
-	ASSERT (nm_connection_verify (connection, &error),
-			TEST19_NAME, "failed to verify %s: %s", file, error->message);
-
-	ASSERT (unmanaged == NULL,
-			TEST19_NAME, "failed to verify %s: unexpected unmanaged value", file);
+	success = nm_connection_verify (connection, &error);
+	g_assert_no_error (error);
+	g_assert (success);
 
 	/* ===== IPv4 SETTING ===== */
-
 	s_ip4 = nm_connection_get_setting_ip4_config (connection);
-	ASSERT (s_ip4 != NULL,
-			TEST19_NAME, "failed to verify %s: missing %s setting",
-			file,
-			NM_SETTING_IP4_CONFIG_SETTING_NAME);
-
-	/* IP addresses */
-	ASSERT (nm_setting_ip_config_get_num_addresses (s_ip4) == 1,
-			TEST19_NAME, "failed to verify %s: unexpected %s / %s key value",
-			file,
-			NM_SETTING_IP4_CONFIG_SETTING_NAME,
-			NM_SETTING_IP_CONFIG_ADDRESSES);
+	g_assert (s_ip4);
 
+	g_assert_cmpint (nm_setting_ip_config_get_num_addresses (s_ip4), ==, 1);
 	ip4_addr = nm_setting_ip_config_get_address (s_ip4, 0);
 	g_assert (ip4_addr != NULL);
 	g_assert_cmpstr (nm_ip_address_get_address (ip4_addr), ==, "10.0.0.3");