summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2023-05-06 12:18:50 +0100
committerSteve Sakoman <steve@sakoman.com>2023-05-17 04:07:12 -1000
commitbaea4975daa45ce3ac5b31342992f7c42a7256cb (patch)
treeb25bfd7a848a1c6ce377e5feb451393edac5fc56
parent9c93500e73d0b2cb6bd77daca3994e7050e05ef8 (diff)
downloadpoky-baea4975daa45ce3ac5b31342992f7c42a7256cb.tar.gz
glib-networking: Add test retry to avoid failures
In autobuilder testing we regularly see glib-networking ptest fail with a "Resource temporarily unavailable (g-io-error-quark, 27)" error. Add a patch to see if a retry can resolve the issue. (From OE-Core rev: 6282f64a6673bcd9b0a6cedfcb8cd3d1a6de1077) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 4deb03ee5af8fcf7c2b1c81c686839341cf753c4) Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/recipes-core/glib-networking/glib-networking/eagain.patch29
-rw-r--r--meta/recipes-core/glib-networking/glib-networking_2.74.0.bb1
2 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-core/glib-networking/glib-networking/eagain.patch b/meta/recipes-core/glib-networking/glib-networking/eagain.patch
new file mode 100644
index 0000000000..6dfbb2736c
--- /dev/null
+++ b/meta/recipes-core/glib-networking/glib-networking/eagain.patch
@@ -0,0 +1,29 @@
1In autobuilder testing we regularly see glib-networking ptest fail with:
2
3GLib-Net:ERROR:/usr/src/debug/glib-networking/2.74.0-r0/tls/tests/connection.c:1944:simul_read_thread: assertion failed (error == NULL): Resource temporarily unavailable (g-io-error-quark, 27)
4Bail out! GLib-Net:ERROR:/usr/src/debug/glib-networking/2.74.0-r0/tls/tests/connection.c:1944:simul_read_thread: assertion failed (error == NULL): Resource temporarily unavailable (g-io-error-quark, 27)
5FAIL: glib-networking/connection-openssl.test (Child process killed by signal 6)
6SUMMARY: total=4; passed=3; skipped=0; failed=1; user=0.9s; system=0.4s; maxrss=10708
7FAIL: glib-networking/connection-openssl.test (Child process killed by signal 6)
8
9The test should probably retry in this situation so test a patch which does this.
10
11Upstream-Status: Pending [testing to see if patch resolves the issue]
12
13Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
14
15Index: glib-networking-2.74.0/tls/tests/connection.c
16===================================================================
17--- glib-networking-2.74.0.orig/tls/tests/connection.c
18+++ glib-networking-2.74.0/tls/tests/connection.c
19@@ -1941,6 +1941,10 @@ simul_read_thread (gpointer user_data)
20 test->buf + test->nread,
21 MIN (TEST_DATA_LENGTH / 2, TEST_DATA_LENGTH - test->nread),
22 NULL, &error);
23+
24+ if (error == G_IO_STATUS_AGAIN)
25+ continue;
26+
27 g_assert_no_error (error);
28
29 test->nread += nread;
diff --git a/meta/recipes-core/glib-networking/glib-networking_2.74.0.bb b/meta/recipes-core/glib-networking/glib-networking_2.74.0.bb
index dc0be23357..b3a88aca8d 100644
--- a/meta/recipes-core/glib-networking/glib-networking_2.74.0.bb
+++ b/meta/recipes-core/glib-networking/glib-networking_2.74.0.bb
@@ -24,6 +24,7 @@ GNOMEBASEBUILDCLASS = "meson"
24inherit gnomebase gettext upstream-version-is-even gio-module-cache ptest-gnome 24inherit gnomebase gettext upstream-version-is-even gio-module-cache ptest-gnome
25 25
26SRC_URI += "file://run-ptest" 26SRC_URI += "file://run-ptest"
27SRC_URI += "file://eagain.patch"
27 28
28FILES:${PN} += "\ 29FILES:${PN} += "\
29 ${libdir}/gio/modules/libgio*.so \ 30 ${libdir}/gio/modules/libgio*.so \