about summary refs log tree commit diff
path: root/src/settings/plugins/keyfile
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2013-02-20 23:06:55 +0100
committerMichael Biebl <biebl@debian.org>2013-02-20 23:06:55 +0100
commit6bb18bdca6b7bf811bdd00dbea1b09f3a367d2dc (patch)
tree8fec068abdd1bc1ade3839f599e1c18d6c524a6a /src/settings/plugins/keyfile
parentfdcb282bbb150da0049cf2dd5b54e56eb3d0b55f (diff)
parent8d275584fc94f398f0a7c990dcd057533d9a5856 (diff)
Merge tag 'upstream/0.9.8.0' into experimental
Upstream version 0.9.8.0
Diffstat (limited to 'src/settings/plugins/keyfile')
-rw-r--r--src/settings/plugins/keyfile/tests/test-keyfile.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/settings/plugins/keyfile/tests/test-keyfile.c b/src/settings/plugins/keyfile/tests/test-keyfile.c
index 8a646e1c..f14e5cf7 100644
--- a/src/settings/plugins/keyfile/tests/test-keyfile.c
+++ b/src/settings/plugins/keyfile/tests/test-keyfile.c
@@ -603,7 +603,7 @@ test_write_wired_connection (void)
 	owner_grp = getegid ();
 	success = nm_keyfile_plugin_write_test_connection (connection, TEST_SCRATCH_DIR, owner_uid, owner_grp, &testfile, &error);
 	ASSERT (success == TRUE,
-			"connection-write", "failed to allocate write keyfile: %s",
+			"connection-write", "failed to write keyfile: %s",
 			error ? error->message : "(none)");
 
 	ASSERT (testfile != NULL,
@@ -821,7 +821,7 @@ test_write_ip6_wired_connection (void)
 	owner_grp = getegid ();
 	success = nm_keyfile_plugin_write_test_connection (connection, TEST_SCRATCH_DIR, owner_uid, owner_grp, &testfile, &error);
 	ASSERT (success == TRUE,
-			"connection-write", "failed to allocate write keyfile: %s",
+			"connection-write", "failed to write keyfile: %s",
 			error ? error->message : "(none)");
 
 	ASSERT (testfile != NULL,
@@ -1139,7 +1139,7 @@ test_write_wireless_connection (void)
 	owner_grp = getegid ();
 	success = nm_keyfile_plugin_write_test_connection (connection, TEST_SCRATCH_DIR, owner_uid, owner_grp, &testfile, &error);
 	ASSERT (success == TRUE,
-			"connection-write", "failed to allocate write keyfile: %s",
+			"connection-write", "failed to write keyfile: %s",
 			error ? error->message : "(none)");
 
 	ASSERT (testfile != NULL,
@@ -1269,7 +1269,7 @@ test_write_string_ssid (void)
 	owner_grp = getegid ();
 	success = nm_keyfile_plugin_write_test_connection (connection, TEST_SCRATCH_DIR, owner_uid, owner_grp, &testfile, &error);
 	ASSERT (success == TRUE,
-			"connection-write", "failed to allocate write keyfile: %s",
+			"connection-write", "failed to write keyfile: %s",
 			error ? error->message : "(none)");
 
 	ASSERT (testfile != NULL,
@@ -1916,7 +1916,7 @@ test_write_bt_dun_connection (void)
 	owner_grp = getegid ();
 	success = nm_keyfile_plugin_write_test_connection (connection, TEST_SCRATCH_DIR, owner_uid, owner_grp, &testfile, &error);
 	ASSERT (success == TRUE,
-			"connection-write", "failed to allocate write keyfile: %s",
+			"connection-write", "failed to write keyfile: %s",
 			error ? error->message : "(none)");
 
 	ASSERT (testfile != NULL,
@@ -2162,7 +2162,7 @@ test_write_gsm_connection (void)
 	owner_grp = getegid ();
 	success = nm_keyfile_plugin_write_test_connection (connection, TEST_SCRATCH_DIR, owner_uid, owner_grp, &testfile, &error);
 	ASSERT (success == TRUE,
-			"connection-write", "failed to allocate write keyfile: %s",
+			"connection-write", "failed to write keyfile: %s",
 			error ? error->message : "(none)");
 
 	ASSERT (testfile != NULL,