Merge branch '2855-test-socket-rename' into 'main'

Rename confusing socket test filenames

Closes #2855

See merge request GNOME/glib!3415

gio/tests/meson.build

@@ -590,8 +590,8 @@ test_extra_programs += {
   'proxy' : {'install' : false},
   'resolver' : {'install' : false},
   'send-data' : {'install' : false},
-  'socket-server' : {'install' : false},
+  'socket-testserver' : {'install' : false},
-  'socket-client' : {
+  'socket-testclient' : {
     'extra_sources' : ['gtlsconsoleinteraction.c'],
     'install' : false,
   },

gio/tests/socket-common.c

@@ -1,4 +1,4 @@
-/* #included into both socket-client.c and socket-server.c */
+/* #included into both socket-testclient.c and socket-testserver.c */
 
 #ifdef G_OS_UNIX
 static const char *unix_socket_address_types[] = {