brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests/test-client: Move out command line handling into helper

Browse Source 
This will allow adding more API for more convenient test client
scripting.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2810>
This commit is contained in:
Jonas Ådahl 2023-02-01 17:49:56 +01:00 committed by Marge Bot
parent 3c65b8d9e0
commit b8d0eb80d7
1 changed files with 52 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
src/tests/meta-test-utils.c
View File

@ -244,13 +244,63 @@ test_client_line_read (GObject *source,
g_main_loop_quit (client->loop); g_main_loop_quit (client->loop);
} }
static gboolean
meta_test_client_do_line (MetaTestClient *client,
const char *line_out,
GError **error)
{
g_autoptr (GError) local_error = NULL;
g_autofree char *line = NULL;
if (!g_data_output_stream_put_string (client->in, line_out,
client->cancellable, error))
return FALSE;
g_data_input_stream_read_line_async (client->out,
G_PRIORITY_DEFAULT,
client->cancellable,
test_client_line_read,
client);
client->error = &local_error;
g_main_loop_run (client->loop);
line = client->line;
client->line = NULL;
client->error = NULL;
if (local_error)
{
g_propagate_error (error, g_steal_pointer (&local_error));
return FALSE;
}
if (!line)
{
g_set_error (error,
META_TEST_CLIENT_ERROR,
META_TEST_CLIENT_ERROR_RUNTIME_ERROR,
"test client exited");
return FALSE;
}
if (strcmp (line, "OK") != 0)
{
g_set_error (error,
META_TEST_CLIENT_ERROR,
META_TEST_CLIENT_ERROR_RUNTIME_ERROR,
"%s", line);
return FALSE;
}
return TRUE;
}
gboolean gboolean
meta_test_client_dov (MetaTestClient *client, meta_test_client_dov (MetaTestClient *client,
GError **error, GError **error,
va_list vap) va_list vap)
{ {
GString *command = g_string_new (NULL); GString *command = g_string_new (NULL);
char *line = NULL;
GError *local_error = NULL; GError *local_error = NULL;
while (TRUE) while (TRUE)
@ -271,46 +321,11 @@ meta_test_client_dov (MetaTestClient *client,
g_string_append_c (command, '\n'); g_string_append_c (command, '\n');
if (!g_data_output_stream_put_string (client->in, command->str, if (!meta_test_client_do_line (client, command->str, &local_error))
client->cancellable, &local_error))
goto out; goto out;
g_data_input_stream_read_line_async (client->out,
G_PRIORITY_DEFAULT,
client->cancellable,
test_client_line_read,
client);
client->error = &local_error;
g_main_loop_run (client->loop);
line = client->line;
client->line = NULL;
client->error = NULL;
if (!line)
{
if (!local_error)
{
g_set_error (&local_error,
META_TEST_CLIENT_ERROR,
META_TEST_CLIENT_ERROR_RUNTIME_ERROR,
"test client exited");
}
goto out;
}
if (strcmp (line, "OK") != 0)
{
g_set_error (&local_error,
META_TEST_CLIENT_ERROR,
META_TEST_CLIENT_ERROR_RUNTIME_ERROR,
"%s", line);
goto out;
}
out: out:
g_string_free (command, TRUE); g_string_free (command, TRUE);
g_free (line);
if (local_error) if (local_error)
{ {