Merge branch 'wip/pwithnall/converter-stream-debugging' into 'main'

tests: Remove an incorrect assertion in converter-stream

See merge request GNOME/glib!2591
This commit is contained in:
Sebastian Dröge 2022-04-06 13:15:01 +00:00
commit 86a24bb19a

View File

@ -1037,12 +1037,11 @@ test_converter_pollable (void)
if (!is_readable)
g_assert_cmpint (res, ==, -1);
/* After closing the write end, we can't get WOULD_BLOCK any more */
if (!socket_out)
{
g_assert_no_error (error);
g_assert_cmpint (res, !=, -1);
}
/* Even after closing the write end, we can get WOULD_BLOCK (particularly
* on FreeBSD), so we cant make any assertions based on `!socket_out`.
* This is because the FIN packets may still be in the out buffer of one
* half of the socket pair, while the in buffer of the other half has some
* data, but not enough for a full block for the converter to consume. */
if (res == -1)
{