luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-23 23:59:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

gdbus-peer test: Use unix:dir address if exact format doesn't matter

Browse Source 
Previously, we used unix:tmpdir, except in tests that verify that a
particular address type works (notably unix:dir). Now we use unix:dir
most of the time, and unix:tmpdir gets its own test instead.

This helps to ensure that the tests continue to work on non-Linux Unix
kernels, where abstract sockets do not exist and so unix:tmpdir is
equivalent to unix:dir, even in the common case where the developer has
only tried the test on Linux.

Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie 2019-10-29 16:18:32 +00:00 committed by Philip Withnall
parent 3560c29d94
commit 73e4bc7fed
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gio/tests/gdbus-peer.c
View File

@ -273,14 +273,9 @@ setup_test_address (void)
{ {
if (is_unix) if (is_unix)
{ {
g_test_message ("Testing with unix:tmpdir address"); g_test_message ("Testing with unix:dir address");
if (g_unix_socket_address_abstract_names_supported ())
tmp_address = g_strdup ("unix:tmpdir=/tmp/gdbus-test-");
else
{
tmpdir = g_dir_make_tmp ("gdbus-test-XXXXXX", NULL); tmpdir = g_dir_make_tmp ("gdbus-test-XXXXXX", NULL);
tmp_address = g_strdup_printf ("unix:tmpdir=%s", tmpdir); tmp_address = g_strdup_printf ("unix:dir=%s", tmpdir);
}
} }
else else
tmp_address = g_strdup ("nonce-tcp:"); tmp_address = g_strdup ("nonce-tcp:");
@ -288,11 +283,11 @@ setup_test_address (void)
#ifdef G_OS_UNIX #ifdef G_OS_UNIX
static void static void
setup_dir_test_address (void) setup_tmpdir_test_address (void)
{ {
g_test_message ("Testing with unix:dir address"); g_test_message ("Testing with unix:tmpdir address");
tmpdir = g_dir_make_tmp ("gdbus-test-XXXXXX", NULL); tmpdir = g_dir_make_tmp ("gdbus-test-XXXXXX", NULL);
tmp_address = g_strdup_printf ("unix:dir=%s", tmpdir); tmp_address = g_strdup_printf ("unix:tmpdir=%s", tmpdir);
} }
static void static void
@ -1045,7 +1040,7 @@ test_peer (void)
teardown_test_address (); teardown_test_address ();
#ifdef G_OS_UNIX #ifdef G_OS_UNIX
setup_dir_test_address (); setup_tmpdir_test_address ();
do_test_peer (); do_test_peer ();
teardown_test_address (); teardown_test_address ();