Merge pull request #10562 from zhsj/pidfd

Fix TestNewBinaryIOCleanup on Go 1.23 and Linux 5.4
2024-08-09 13:13:58 +00:00 · 2024-08-09 13:13:58 +00:00 · 268ae7fa02
commit 268ae7fa02
parent ee86aba275 8ef73c5dd5
1 changed files with 2 additions and 1 deletions
--- a/cmd/containerd-shim-runc-v2/process/io_test.go
+++ b/cmd/containerd-shim-runc-v2/process/io_test.go
@ -88,7 +88,8 @@ func descriptorCount(t *testing.T) int {
 			continue
 		}

-		if strings.HasPrefix(sym, "pidfd:") {
+		if strings.Contains(sym, "pidfd") {
+			// Either pidfd:[70517] or anon_inode:[pidfd] (on Linux 5.4)
 			files = append(files[:i], files[i+1:]...)
 		}
 	}