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

Merge branch '3148-stream-test' into 'main'

Browse Source 
tests: Use a pipe rather than a socketpair in stream-rw_all test

Closes #3148

See merge request GNOME/glib!3691
This commit is contained in:
Philip Withnall 2023-11-28 11:43:51 +00:00
commit c406c6de6b
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gio/tests/stream-rw_all.c
View File

@ -44,7 +44,7 @@ static void
wait_for_read (gboolean success, wait_for_read (gboolean success,
gsize read) gsize read)
{ {
g_assert (!got_read_done); g_assert_false (got_read_done);
expected_read_success = success; expected_read_success = success;
expected_read = read; expected_read = read;
@ -76,7 +76,7 @@ static void
wait_for_write (gboolean success, wait_for_write (gboolean success,
gsize written) gsize written)
{ {
g_assert (!got_write_done); g_assert_false (got_write_done);
expected_write_success = success; expected_write_success = success;
expected_written = written; expected_written = written;
@ -110,7 +110,7 @@ test_write_all_async_memory (void)
g_output_stream_write_all_async (ms, "0123456789", 10, 0, NULL, write_done, NULL); g_output_stream_write_all_async (ms, "0123456789", 10, 0, NULL, write_done, NULL);
wait_for_write (FALSE, 0); wait_for_write (FALSE, 0);
g_assert (!memcmp (b, "012345678901234567890123", 24)); g_assert_cmpint (memcmp (b, "012345678901234567890123", 24), ==, 0);
g_object_unref (ms); g_object_unref (ms);
} }
@ -126,16 +126,16 @@ test_read_all_async_memory (void)
g_input_stream_read_all_async (ms, buf, 10, 0, NULL, read_done, NULL); g_input_stream_read_all_async (ms, buf, 10, 0, NULL, read_done, NULL);
wait_for_read (TRUE, 10); wait_for_read (TRUE, 10);
g_assert (!memcmp (buf, "0123456789", 10)); g_assert_cmpint (memcmp (buf, "0123456789", 10), ==, 0);
g_input_stream_read_all_async (ms, buf, 10, 0, NULL, read_done, NULL); g_input_stream_read_all_async (ms, buf, 10, 0, NULL, read_done, NULL);
wait_for_read (TRUE, 10); wait_for_read (TRUE, 10);
g_assert (!memcmp (buf, "ABCDEFGHIJ", 10)); g_assert_cmpint (memcmp (buf, "ABCDEFGHIJ", 10), ==, 0);
/* partial read... */ /* partial read... */
g_input_stream_read_all_async (ms, buf, 10, 0, NULL, read_done, NULL); g_input_stream_read_all_async (ms, buf, 10, 0, NULL, read_done, NULL);
wait_for_read (TRUE, 4); wait_for_read (TRUE, 4);
g_assert (!memcmp (buf, "!@#$", 4)); g_assert_cmpint (memcmp (buf, "!@#$", 4), ==, 0);
/* EOF */ /* EOF */
g_input_stream_read_all_async (ms, buf, 10, 0, NULL, read_done, NULL); g_input_stream_read_all_async (ms, buf, 10, 0, NULL, read_done, NULL);
@ -146,6 +146,7 @@ test_read_all_async_memory (void)
#ifdef G_OS_UNIX #ifdef G_OS_UNIX
#include <errno.h> #include <errno.h>
#include <glib-unix.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <gio/gunixinputstream.h> #include <gio/gunixinputstream.h>
@ -165,13 +166,12 @@ test_read_write_all_async_pipe (void)
{ {
gint sv[2]; gint sv[2];
gint s;
s = socketpair (AF_UNIX, SOCK_STREAM, 0, sv); g_unix_open_pipe (sv, O_CLOEXEC | O_NONBLOCK, &error);
g_assert (s == 0); g_assert_no_error (error);
out = g_unix_output_stream_new (sv[0], TRUE); out = g_unix_output_stream_new (sv[1], TRUE);
in = g_unix_input_stream_new (sv[1], TRUE); in = g_unix_input_stream_new (sv[0], TRUE);
} }
/* Try to fill up the buffer */ /* Try to fill up the buffer */
@ -180,7 +180,7 @@ test_read_write_all_async_pipe (void)
{ {
s = g_output_stream_write (out, wbuf, sizeof wbuf, NULL, &error); s = g_output_stream_write (out, wbuf, sizeof wbuf, NULL, &error);
g_assert_no_error (error); g_assert_no_error (error);
g_assert (s > 0); g_assert_cmpint (s, >, 0);
in_flight += s; in_flight += s;
} }
@ -189,7 +189,7 @@ test_read_write_all_async_pipe (void)
g_output_stream_write_all_async (out, "0123456789", 10, 0, cancellable, write_done, NULL); g_output_stream_write_all_async (out, "0123456789", 10, 0, cancellable, write_done, NULL);
while (g_main_context_iteration (NULL, FALSE)) while (g_main_context_iteration (NULL, FALSE))
; ;
g_assert (!got_write_done); g_assert_false (got_write_done);
/* Cancel that to make sure it works */ /* Cancel that to make sure it works */
g_cancellable_cancel (cancellable); g_cancellable_cancel (cancellable);
@ -200,7 +200,7 @@ test_read_write_all_async_pipe (void)
g_output_stream_write_all_async (out, "0123456789", 10, 0, NULL, write_done, NULL); g_output_stream_write_all_async (out, "0123456789", 10, 0, NULL, write_done, NULL);
while (g_main_context_iteration (NULL, FALSE)) while (g_main_context_iteration (NULL, FALSE))
; ;
g_assert (!got_write_done); g_assert_false (got_write_done);
/* Now drain as much as we originally put in the buffer to make it /* Now drain as much as we originally put in the buffer to make it
* block -- this will unblock the writer. * block -- this will unblock the writer.
@ -209,7 +209,7 @@ test_read_write_all_async_pipe (void)
{ {
s = g_input_stream_read (in, rbuf, MIN (sizeof wbuf, in_flight), NULL, &error); s = g_input_stream_read (in, rbuf, MIN (sizeof wbuf, in_flight), NULL, &error);
g_assert_no_error (error); g_assert_no_error (error);
g_assert (s > 0); g_assert_cmpint (s, >, 0);
in_flight -= s; in_flight -= s;
} }
@ -221,7 +221,7 @@ test_read_write_all_async_pipe (void)
/* The write is surely finished by now */ /* The write is surely finished by now */
wait_for_write (TRUE, 10); wait_for_write (TRUE, 10);
/* ...but the read will not yet be satisfied */ /* ...but the read will not yet be satisfied */
g_assert (!got_read_done); g_assert_false (got_read_done);
/* Feed the read more than it asked for; this really should not block /* Feed the read more than it asked for; this really should not block
* since the buffer is so small... * since the buffer is so small...