mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2026-02-05 13:30:33 +01:00
server-oom test: Parse the address instead of going directly to TCP
This expands test coverage, and lets us reuse the test for other
address schemes.
Signed-off-by: Simon McVittie <smcv@collabora.com>
Reviewed-by: Philip Withnall <withnall@endlessm.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=106812
(cherry picked from commit b19c9e2f26)
This commit is contained in:
parent
8ec0b5ae2d
commit
102129f86a
1 changed files with 7 additions and 23 deletions
|
|
@ -38,30 +38,14 @@
|
|||
/* Return TRUE if the right thing happens, but the right thing might include
|
||||
* OOM. */
|
||||
static dbus_bool_t
|
||||
test_new_tcp (void *user_data)
|
||||
test_new_server (void *user_data)
|
||||
{
|
||||
const char *listen_address = user_data;
|
||||
DBusError error = DBUS_ERROR_INIT;
|
||||
DBusServer *server = NULL;
|
||||
dbus_bool_t use_nonce = FALSE;
|
||||
const char *bind = "localhost";
|
||||
const char *family = NULL;
|
||||
dbus_bool_t result = FALSE;
|
||||
|
||||
if (user_data != NULL)
|
||||
{
|
||||
if (strcmp (user_data, "nonce") == 0)
|
||||
use_nonce = TRUE;
|
||||
|
||||
if (strcmp (user_data, "star") == 0)
|
||||
bind = "*";
|
||||
|
||||
if (strcmp (user_data, "v4") == 0)
|
||||
family = "ipv4";
|
||||
}
|
||||
|
||||
server = _dbus_server_new_for_tcp_socket ("localhost", bind,
|
||||
"0", family, &error,
|
||||
use_nonce);
|
||||
server = dbus_server_listen (listen_address, &error);
|
||||
|
||||
if (server == NULL)
|
||||
goto out;
|
||||
|
|
@ -136,10 +120,10 @@ main (int argc,
|
|||
test_init (&argc, &argv);
|
||||
|
||||
test_cases_to_free = g_queue_new ();
|
||||
add_oom_test ("/server/new-tcp", test_new_tcp, NULL);
|
||||
add_oom_test ("/server/new-nonce-tcp", test_new_tcp, "nonce");
|
||||
add_oom_test ("/server/new-tcp-star", test_new_tcp, "star");
|
||||
add_oom_test ("/server/new-tcp-v4", test_new_tcp, "v4");
|
||||
add_oom_test ("/server/new-tcp", test_new_server, "tcp:host=localhost,bind=localhost");
|
||||
add_oom_test ("/server/new-nonce-tcp", test_new_server, "nonce-tcp:host=localhost,bind=localhost");
|
||||
add_oom_test ("/server/new-tcp-star", test_new_server, "tcp:host=localhost,bind=*");
|
||||
add_oom_test ("/server/new-tcp-v4", test_new_server, "tcp:host=localhost,bind=localhost,family=ipv4");
|
||||
|
||||
ret = g_test_run ();
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue