From bde724e5ac926224da913079899cd81cd95ed15f Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Wed, 15 Feb 2023 13:21:30 +0000 Subject: [PATCH] Revert "Revert "tests: Temporarily disable socket test due to a kernel bug"" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 27bee8fe5d0acfa885e4e655701d69ca5180770f. Inevitably, despite testing the CI multiple times before merging commit 27bee8fe, the CI is now failing again in the `socket` test due to (what I continue to assume is) the kernel regression: https://gitlab.gnome.org/martinpitt/glib/-/jobs/2585332 In order to unblock development on `main` expediently, I guess I’ll just revert the revert. Signed-off-by: Philip Withnall Reopens: #2879 --- gio/tests/socket.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gio/tests/socket.c b/gio/tests/socket.c index c1c1bcf41..e7aadbd63 100644 --- a/gio/tests/socket.c +++ b/gio/tests/socket.c @@ -1621,6 +1621,10 @@ test_source_postmortem (void) static 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; GError *error = NULL; GInetAddress *iaddr; @@ -1657,6 +1661,7 @@ test_reuse_tcp (void) g_object_unref (sock1); g_object_unref (sock2); +#endif } static void