From 18048ab20c81dad90fc751ec3387a3aab8814211 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 20 Oct 2017 20:56:25 +0200
Subject: [PATCH] ifcfg-rh/tests: rename test function
 connection_from_file_test()

Test functions shall have a nmtst_ prefix. Then they don't need
a code comment that they are for testing only.
---
 src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c | 10 +++++-----
 src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.h | 11 +++++------
 src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c |  6 +++---
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
index ab9f127f5f..fcf0ccbbf1 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
@@ -5433,11 +5433,11 @@ connection_from_file (const char *filename,
 }
 
 NMConnection *
-connection_from_file_test (const char *filename,
-                           const char *network_file,
-                           const char *test_type,
-                           char **out_unhandled,
-                           GError **error)
+nmtst_connection_from_file (const char *filename,
+                            const char *network_file,
+                            const char *test_type,
+                            char **out_unhandled,
+                            GError **error)
 {
 	return connection_from_file_full (filename,
 	                                  network_file,
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.h b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.h
index 4c519a0835..a8937ac868 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.h
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.h
@@ -30,11 +30,10 @@ NMConnection *connection_from_file (const char *filename,
 
 guint devtimeout_from_file (const char *filename);
 
-/* for test-ifcfg-rh */
-NMConnection *connection_from_file_test (const char *filename,
-                                         const char *network_file,
-                                         const char *test_type,
-                                         char **out_unhandled,
-                                         GError **error);
+NMConnection *nmtst_connection_from_file (const char *filename,
+                                          const char *network_file,
+                                          const char *test_type,
+                                          char **out_unhandled,
+                                          GError **error);
 
 #endif  /* __READER_H__ */
diff --git a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
index 0fb0a28a39..3c4d76726f 100644
--- a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
+++ b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
@@ -260,8 +260,8 @@ _connection_from_file (const char *filename,
 
 	g_assert (!out_unhandled || !*out_unhandled);
 
-	connection = connection_from_file_test (filename, network_file, test_type,
-	                                        out_unhandled ?: &unhandled_fallback, &error);
+	connection = nmtst_connection_from_file (filename, network_file, test_type,
+	                                         out_unhandled ?: &unhandled_fallback, &error);
 	g_assert_no_error (error);
 	g_assert (!unhandled_fallback);
 
@@ -282,7 +282,7 @@ _connection_from_file_fail (const char *filename,
 	GError *local = NULL;
 	char *unhandled = NULL;
 
-	connection = connection_from_file_test (filename, network_file, test_type, &unhandled, &local);
+	connection = nmtst_connection_from_file (filename, network_file, test_type, &unhandled, &local);
 
 	g_assert (!connection);
 	g_assert (local);