From 33c72e6c4a0d9d37ea7babee4a09e516964c724a Mon Sep 17 00:00:00 2001 From: Nan Liu Date: Tue, 17 Mar 2026 21:22:03 +0000 Subject: [PATCH 1/3] =?UTF-8?q?fix=20(socat):=20skip=20%check=20=E2=80=94?= =?UTF-8?q?=20flaky=20proxy=20tests=20fail=20in=20mock?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- base/comps/socat/socat.comp.toml | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/base/comps/socat/socat.comp.toml b/base/comps/socat/socat.comp.toml index 536301bb4dd..e5e0f3b0fe2 100644 --- a/base/comps/socat/socat.comp.toml +++ b/base/comps/socat/socat.comp.toml @@ -1,14 +1,4 @@ [components.socat] -[[components.socat.overlays]] -description = "Export SHELL env var — socat SHELL address type requires it but mock chroot does not set it" -type = "spec-prepend-lines" -section = "%check" -lines = ["export SHELL=/bin/bash"] - -[[components.socat.overlays]] -description = "Exclude VSOCK_ECHO test (410) — /dev/vsock unavailable in mock chroot" -type = "spec-search-replace" -section = "%check" -regex = '-a \\\\\$N -ne 528' -replacement = '-a \\$N -ne 410 -a \\$N -ne 528' +[components.socat.build] +check = { skip = true, skip_reason = "Some flaky tests failed due to race condition." } From 4d4519af3cd66d8535472c66d4cf426d3c612867 Mon Sep 17 00:00:00 2001 From: Nan Liu Date: Tue, 17 Mar 2026 22:10:42 +0000 Subject: [PATCH 2/3] fix: update skip reason --- base/comps/socat/socat.comp.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/comps/socat/socat.comp.toml b/base/comps/socat/socat.comp.toml index e5e0f3b0fe2..7b4336823b9 100644 --- a/base/comps/socat/socat.comp.toml +++ b/base/comps/socat/socat.comp.toml @@ -1,4 +1,4 @@ [components.socat] [components.socat.build] -check = { skip = true, skip_reason = "Some flaky tests failed due to race condition." } +check = { skip = true, skip_reason = "Tests 466, 511, 512, 587, 591, 592, 593 fail intermittently in mock/Koji due to child process scheduling jitter causing output ordering mismatches" } From 685b3f733650464a52e1c994f2c73f34b27828dd Mon Sep 17 00:00:00 2001 From: Nan Liu Date: Wed, 18 Mar 2026 20:03:47 +0000 Subject: [PATCH 3/3] fix (socat): move to inline definition and shared check-disablement list --- base/comps/component-check-disablement.toml | 1 + base/comps/components.toml | 1 + base/comps/socat/socat.comp.toml | 4 ---- 3 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 base/comps/socat/socat.comp.toml diff --git a/base/comps/component-check-disablement.toml b/base/comps/component-check-disablement.toml index 8e2d4608866..97e1d9a4d32 100644 --- a/base/comps/component-check-disablement.toml +++ b/base/comps/component-check-disablement.toml @@ -77,6 +77,7 @@ components = [ "satyr", "scancode-toolkit", "scipy", + "socat", "srt", "sssd", "superlu_dist", diff --git a/base/comps/components.toml b/base/comps/components.toml index ac2c4ba2c5c..a3ed12bdde2 100644 --- a/base/comps/components.toml +++ b/base/comps/components.toml @@ -300,6 +300,7 @@ includes = ["**/*.comp.toml", "components-full.toml", "component-check-disableme [components.setup] [components.shadow-utils] [components.slang] +[components.socat] [components.sqlite] [components.sssd] [components.strace] diff --git a/base/comps/socat/socat.comp.toml b/base/comps/socat/socat.comp.toml deleted file mode 100644 index 7b4336823b9..00000000000 --- a/base/comps/socat/socat.comp.toml +++ /dev/null @@ -1,4 +0,0 @@ -[components.socat] - -[components.socat.build] -check = { skip = true, skip_reason = "Tests 466, 511, 512, 587, 591, 592, 593 fail intermittently in mock/Koji due to child process scheduling jitter causing output ordering mismatches" }