Merge branch 'wip/pwithnall/reenable-socket-tests' into 'main'

Revert "tests: Temporarily disable socket test due to a kernel bug"

Closes #2879

See merge request GNOME/glib!3467
This commit is contained in:
Philip Withnall 2023-06-07 13:37:40 +00:00
commit 0adbf23fbe

View File

@ -1621,10 +1621,6 @@ test_source_postmortem (void)
static void static void
test_reuse_tcp (void) test_reuse_tcp (void)
{ {
#if 1
g_test_skip ("Test is currently failing due to a kernel bug; see https://gitlab.gnome.org/GNOME/glib/-/issues/2879");
return;
#else
GSocket *sock1, *sock2; GSocket *sock1, *sock2;
GError *error = NULL; GError *error = NULL;
GInetAddress *iaddr; GInetAddress *iaddr;
@ -1661,7 +1657,6 @@ test_reuse_tcp (void)
g_object_unref (sock1); g_object_unref (sock1);
g_object_unref (sock2); g_object_unref (sock2);
#endif
} }
static void static void