Update upstream source from tag 'upstream/1.11.4'

Update to upstream version '1.11.4'
with Debian dir d0638aa2e32d5bae4e8daa021b9a66b7c4d6647e

4 files changed, 90 insertions, 24 deletions

diff --git a/libnm/tests/meson.build b/libnm/tests/meson.build
index c47814b3..e2b88273 100644
--- a/libnm/tests/meson.build
+++ b/libnm/tests/meson.build
@@ -1,28 +1,28 @@
 test_units = [
-  ['test-general', shared_utils, [libnm_utils]],
-  ['test-nm-client', shared_test_utils, []],
-  ['test-remote-settings-client',  shared_test_utils, []],
-  ['test-secret-agent', shared_test_utils, []]
-]
-
-deps = [
-  libnm_dep,
-  nm_core_dep
+  ['test-general',                [libnm_utils, libnm_core]],
+  ['test-nm-client',              []],
+  ['test-remote-settings-client', []],
+  ['test-secret-agent',           []],
 ]
 
 cflags = [
   '-DNETWORKMANAGER_COMPILATION_TEST',
   '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM',
-  '-DTEST_NM_SERVICE="@0@"'.format(join_paths(meson.source_root(), 'tools', 'test-networkmanager-service.py'))
-]
+] + nm_build_cflags
 
 foreach test_unit: test_units
   exe = executable(
     'libnm-' + test_unit[0],
-    [test_unit[0] + '.c'] + test_unit[1],
-    dependencies: deps,
+    [
+      test_unit[0] + '.c',
+      shared_nm_test_utils_impl_c,
+    ],
+    dependencies: [
+      libnm_dep,
+      nm_core_dep,
+    ],
     c_args: cflags,
-    link_with: test_unit[2]
+    link_with: test_unit[1]
   )
 
   test(
@@ -35,7 +35,7 @@ endforeach
 # just test, that we can build "nm-vpn-plugin-utils.c"
 libnm_vpn_plugin_utils_test = static_library(
   'nm-vpn-plugin-utils-test',
-  sources: shared_vpn_plugin_utils + [libnm_enum[1]],
+  sources: shared_nm_utils_nm_vpn_plugin_utils_c + [libnm_enum[1]],
   include_directories: libnm_inc,
   dependencies: nm_core_dep,
   c_args: cflags
diff --git a/libnm/tests/test-nm-client.c b/libnm/tests/test-nm-client.c
index 63822882..21272e4d 100644
--- a/libnm/tests/test-nm-client.c
+++ b/libnm/tests/test-nm-client.c
@@ -70,6 +70,9 @@ test_device_added (void)
 	GError *error = NULL;
 
 	sinfo = nmtstc_service_init ();
+	if (!nmtstc_service_available (sinfo))
+		return;
+
 	client = nm_client_new (NULL, &error);
 	g_assert_no_error (error);
 
@@ -163,6 +166,9 @@ test_device_added_signal_after_init (void)
 	GError *error = NULL;
 
 	sinfo = nmtstc_service_init ();
+	if (!nmtstc_service_available (sinfo))
+		return;
+
 	client = nm_client_new (NULL, &error);
 	g_assert_no_error (error);
 
@@ -311,6 +317,9 @@ test_wifi_ap_added_removed (void)
 	char *expected_path = NULL;
 
 	sinfo = nmtstc_service_init ();
+	if (!nmtstc_service_available (sinfo))
+		return;
+
 	client = nm_client_new (NULL, &error);
 	g_assert_no_error (error);
 
@@ -510,6 +519,9 @@ test_wimax_nsp_added_removed (void)
 	char *expected_path = NULL;
 
 	sinfo = nmtstc_service_init ();
+	if (!nmtstc_service_available (sinfo))
+		return;
+
 	client = nm_client_new (NULL, &error);
 	g_assert_no_error (error);
 
@@ -686,6 +698,8 @@ test_devices_array (void)
 	GVariant *ret;
 
 	sinfo = nmtstc_service_init ();
+	if (!nmtstc_service_available (sinfo))
+		return;
 
 	/* Make sure that we test the async codepath in at least one test... */
 	nm_client_new_async (NULL, new_client_cb, &client);
@@ -778,7 +792,8 @@ nm_running_changed (GObject *client,
 static void
 test_client_nm_running (void)
 {
-	NMClient *client1, *client2;
+	gs_unref_object NMClient *client1 = NULL;
+	gs_unref_object NMClient *client2 = NULL;
 	guint quit_id;
 	int running_changed = 0;
 	GError *error = NULL;
@@ -801,6 +816,9 @@ test_client_nm_running (void)
 
 	/* Now start the test service. */
 	sinfo = nmtstc_service_init ();
+	if (!nmtstc_service_available (sinfo))
+		return;
+
 	client2 = nm_client_new (NULL, &error);
 	g_assert_no_error (error);
 
@@ -828,9 +846,6 @@ test_client_nm_running (void)
 	g_assert_cmpint (running_changed, ==, 2);
 	g_assert (!nm_client_get_nm_running (client1));
 	g_source_remove (quit_id);
-
-	g_object_unref (client1);
-	g_object_unref (client2);
 }
 
 typedef struct {
@@ -934,6 +949,9 @@ test_active_connections (void)
 	GError *error = NULL;
 
 	sinfo = nmtstc_service_init ();
+	if (!nmtstc_service_available (sinfo))
+		return;
+
 	client = nm_client_new (NULL, &error);
 	g_assert_no_error (error);
 
@@ -1063,6 +1081,9 @@ test_activate_virtual (void)
 	GError *error = NULL;
 
 	sinfo = nmtstc_service_init ();
+	if (!nmtstc_service_available (sinfo))
+		return;
+
 	client = nm_client_new (NULL, &error);
 	g_assert_no_error (error);
 
@@ -1138,6 +1159,9 @@ test_activate_failed (void)
 	GError *error = NULL;
 
 	sinfo = nmtstc_service_init ();
+	if (!nmtstc_service_available (sinfo))
+		return;
+
 	client = nm_client_new (NULL, &error);
 	g_assert_no_error (error);
 
@@ -1172,6 +1196,9 @@ test_device_connection_compatibility (void)
 	const char *hw_addr2 = "52:54:00:ab:db:24";
 
 	sinfo = nmtstc_service_init ();
+	if (!nmtstc_service_available (sinfo))
+		return;
+
 	client = nm_client_new (NULL, &error);
 	g_assert_no_error (error);
 
@@ -1345,10 +1372,8 @@ test_connection_invalid (void)
 	                               FALSE,
 	                               &path3);
 
-
 	nmtst_main_loop_run (loop, 1000);
 
-
 	connections = nm_client_get_connections (client);
 	g_assert (connections);
 
@@ -1595,4 +1620,3 @@ main (int argc, char **argv)
 
 	return g_test_run ();
 }
-
diff --git a/libnm/tests/test-remote-settings-client.c b/libnm/tests/test-remote-settings-client.c
index f6c37e91..45d60c06 100644
--- a/libnm/tests/test-remote-settings-client.c
+++ b/libnm/tests/test-remote-settings-client.c
@@ -63,6 +63,9 @@ test_add_connection (void)
 	time_t start, now;
 	gboolean done = FALSE;
 
+	if (!nmtstc_service_available (sinfo))
+		return;
+
 	connection = nmtst_create_minimal_connection (TEST_CON_ID, NULL, NM_SETTING_WIRED_SETTING_NAME, NULL);
 
 	nm_client_add_connection_async (client,
@@ -137,6 +140,9 @@ test_make_invisible (void)
 	gboolean has_settings = FALSE;
 	char *path;
 
+	if (!nmtstc_service_available (sinfo))
+		return;
+
 	g_assert (remote != NULL);
 
 	/* Listen for the remove event when the connection becomes invisible */
@@ -215,6 +221,9 @@ test_make_visible (void)
 	char *path;
 	NMRemoteConnection *new = NULL;
 
+	if (!nmtstc_service_available (sinfo))
+		return;
+
 	g_assert (remote != NULL);
 
 	/* Wait for the new-connection signal when the connection is visible again */
@@ -304,6 +313,9 @@ test_remove_connection (void)
 	gboolean done = FALSE;
 	char *path;
 
+	if (!nmtstc_service_available (sinfo))
+		return;
+
 	/* Find a connection to delete */
 	conns = nm_client_get_connections (client);
 	g_assert_cmpint (conns->len, >, 0);
@@ -384,6 +396,9 @@ test_add_remove_connection (void)
 	time_t start, now;
 	gboolean done = FALSE;
 
+	if (!nmtstc_service_available (sinfo))
+		return;
+
 	/* This will cause the test server to immediately delete the connection
 	 * after creating it.
 	 */
@@ -437,6 +452,9 @@ test_add_bad_connection (void)
 	time_t start, now;
 	gboolean done = FALSE;
 
+	if (!nmtstc_service_available (sinfo))
+		return;
+
 	/* The test daemon doesn't support bond connections */
 	connection = nmtst_create_minimal_connection ("bad connection test", NULL, NM_SETTING_BOND_SETTING_NAME, NULL);
 
@@ -480,6 +498,9 @@ test_save_hostname (void)
 	gboolean done = FALSE;
 	GError *error = NULL;
 
+	if (!nmtstc_service_available (sinfo))
+		return;
+
 	/* test-networkmanager-service.py requires the hostname to contain a '.' */
 	nm_client_save_hostname (client, "foo", NULL, &error);
 	g_assert_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_HOSTNAME);
diff --git a/libnm/tests/test-secret-agent.c b/libnm/tests/test-secret-agent.c
index 25752e9a..746a9e64 100644
--- a/libnm/tests/test-secret-agent.c
+++ b/libnm/tests/test-secret-agent.c
@@ -247,6 +247,9 @@ test_setup (TestSecretAgentData *sadata, gconstpointer test_data)
 	GError *error = NULL;
 
 	sadata->sinfo = nmtstc_service_init ();
+	if (!sadata->sinfo)
+		return;
+
 	sadata->client = nm_client_new (NULL, &error);
 	g_assert_no_error (error);
 
@@ -311,6 +314,9 @@ test_cleanup (TestSecretAgentData *sadata, gconstpointer test_data)
 	GVariant *ret;
 	GError *error = NULL;
 
+	if (!sadata->sinfo)
+		return;
+
 	if (sadata->agent) {
 		if (nm_secret_agent_old_get_registered (sadata->agent)) {
 			nm_secret_agent_old_unregister (sadata->agent, NULL, &error);
@@ -360,6 +366,9 @@ connection_activated_none_cb (GObject *c,
 static void
 test_secret_agent_none (TestSecretAgentData *sadata, gconstpointer test_data)
 {
+	if (!nmtstc_service_available (sadata->sinfo))
+		return;
+
 	nm_client_activate_connection_async (sadata->client,
 	                                     sadata->connection,
 	                                     sadata->device,
@@ -405,6 +414,9 @@ connection_activated_no_secrets_cb (GObject *c,
 static void
 test_secret_agent_no_secrets (TestSecretAgentData *sadata, gconstpointer test_data)
 {
+	if (!nmtstc_service_available (sadata->sinfo))
+		return;
+
 	g_signal_connect (sadata->agent, "secret-requested",
 	                  G_CALLBACK (secrets_requested_no_secrets_cb),
 	                  sadata);
@@ -456,6 +468,9 @@ secrets_requested_cancel_cb (TestSecretAgent *agent,
 static void
 test_secret_agent_cancel (TestSecretAgentData *sadata, gconstpointer test_data)
 {
+	if (!nmtstc_service_available (sadata->sinfo))
+		return;
+
 	g_signal_connect (sadata->agent, "secret-requested",
 	                  G_CALLBACK (secrets_requested_cancel_cb),
 	                  sadata);
@@ -510,6 +525,9 @@ secrets_requested_good_cb (TestSecretAgent *agent,
 static void
 test_secret_agent_good (TestSecretAgentData *sadata, gconstpointer test_data)
 {
+	if (!nmtstc_service_available (sadata->sinfo))
+		return;
+
 	g_signal_connect (sadata->agent, "secret-requested",
 	                  G_CALLBACK (secrets_requested_good_cb),
 	                  sadata);
@@ -526,7 +544,6 @@ test_secret_agent_good (TestSecretAgentData *sadata, gconstpointer test_data)
 	g_assert_cmpint (sadata->secrets_requested, ==, 1);
 }
 
-
 static void
 async_init_cb (GObject *object, GAsyncResult *result, gpointer user_data)
 {
@@ -566,7 +583,6 @@ test_secret_agent_nm_not_running (void)
 	g_main_loop_unref (loop);
 }
 
-
 static void
 registered_changed (GObject *object, GParamSpec *pspec, gpointer user_data)
 {
@@ -584,6 +600,9 @@ test_secret_agent_auto_register (void)
 	GError *error = NULL;
 
 	sinfo = nmtstc_service_init ();
+	if (!nmtstc_service_available (sinfo))
+		return;
+
 	loop = g_main_loop_new (NULL, FALSE);
 
 	agent = test_secret_agent_new ();
@@ -611,6 +630,8 @@ test_secret_agent_auto_register (void)
 
 	/* Restart test service */
 	sinfo = nmtstc_service_init ();
+	g_assert (nmtstc_service_available (sinfo));
+
 	g_main_loop_run (loop);
 	g_assert (nm_secret_agent_old_get_registered (agent));