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

Merge branch '1929-dbus-auth-locking' into 'main'

Browse Source 
gdbusauthmechanismsha1: Don’t delete a stale lock file if it’s changed

Closes #1929

See merge request GNOME/glib!2511
This commit is contained in:
Simon McVittie
2022-02-21 13:48:54 +00:00
parent 8f241c46b9 01a432d6ff
commit 3c12ddce81
3 changed files with 44 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
gio/tests/gdbus-connection-flush.c
View File

@@ -179,8 +179,8 @@ setup_client_cb (GObject *source,
f->client_conn = g_dbus_connection_new_finish (res, &f->error);
g_assert_no_error (f->error);
g_assert (G_IS_DBUS_CONNECTION (f->client_conn));
g_assert (f->client_conn == G_DBUS_CONNECTION (source));
g_assert_true (G_IS_DBUS_CONNECTION (f->client_conn));
g_assert_true (f->client_conn == G_DBUS_CONNECTION (source));
}
static void
@@ -192,8 +192,8 @@ setup_server_cb (GObject *source,
f->server_conn = g_dbus_connection_new_finish (res, &f->error);
g_assert_no_error (f->error);
g_assert (G_IS_DBUS_CONNECTION (f->server_conn));
g_assert (f->server_conn == G_DBUS_CONNECTION (source));
g_assert_true (G_IS_DBUS_CONNECTION (f->server_conn));
g_assert_true (f->server_conn == G_DBUS_CONNECTION (source));
}
static void
@@ -206,21 +206,21 @@ setup (Fixture *f,
ok = test_pipe (&f->server_istream, &f->client_real_ostream, &f->error);
g_assert_no_error (f->error);
g_assert (G_IS_OUTPUT_STREAM (f->client_real_ostream));
g_assert (G_IS_INPUT_STREAM (f->server_istream));
g_assert (ok);
g_assert_true (G_IS_OUTPUT_STREAM (f->client_real_ostream));
g_assert_true (G_IS_INPUT_STREAM (f->server_istream));
g_assert_true (ok);
f->client_ostream = g_object_new (MY_TYPE_OUTPUT_STREAM,
"base-stream", f->client_real_ostream,
"close-base-stream", TRUE,
NULL);
g_assert (G_IS_OUTPUT_STREAM (f->client_ostream));
g_assert_true (G_IS_OUTPUT_STREAM (f->client_ostream));
ok = test_pipe (&f->client_istream, &f->server_ostream, &f->error);
g_assert_no_error (f->error);
g_assert (G_IS_OUTPUT_STREAM (f->server_ostream));
g_assert (G_IS_INPUT_STREAM (f->client_istream));
g_assert (ok);
g_assert_true (G_IS_OUTPUT_STREAM (f->server_ostream));
g_assert_true (G_IS_INPUT_STREAM (f->client_istream));
g_assert_true (ok);
f->client_stream = test_io_stream_new (f->client_istream, f->client_ostream);
f->server_stream = test_io_stream_new (f->server_istream, f->server_ostream);
@@ -244,13 +244,13 @@ flush_cb (GObject *source,
Fixture *f = user_data;
gboolean ok;
g_assert (G_IS_DBUS_CONNECTION (source));
g_assert (G_IS_DBUS_CONNECTION (f->client_conn));
g_assert_true (G_IS_DBUS_CONNECTION (source));
g_assert_true (G_IS_DBUS_CONNECTION (f->client_conn));
g_assert_cmpuint ((guintptr) f->client_conn, ==, (guintptr) G_DBUS_CONNECTION (source));
ok = g_dbus_connection_flush_finish (f->client_conn, res, &f->error);
g_assert_no_error (f->error);
g_assert (ok);
g_assert_true (ok);
f->flushed = TRUE;
}
@@ -270,7 +270,7 @@ test_flush_busy (Fixture *f,
"com.example.Foo", "SomeSignal", NULL,
&f->error);
g_assert_no_error (f->error);
g_assert (ok);
g_assert_true (ok);
/* wait for at least part of the message to have started writing -
* the write will block indefinitely in the worker thread
@@ -318,7 +318,7 @@ test_flush_idle (Fixture *f,
"com.example.Foo", "SomeSignal", NULL,
&f->error);
g_assert_no_error (f->error);
g_assert (ok);
g_assert_true (ok);
/* wait for at least part of the message to have been written */
do {
@@ -368,9 +368,6 @@ main (int argc,
{
gint ret;
/* FIXME: Add debug for https://gitlab.gnome.org/GNOME/glib/issues/1929 */
g_setenv ("G_DBUS_DEBUG", "authentication", TRUE);
g_test_init (&argc, &argv, NULL);
g_test_add ("/gdbus/connection/flush/busy", Fixture, NULL,