Merge pull request containerd#10562 from zhsj/pidfd

dmcgowan · web-flow · commit 268ae7fa0299 · 2024-08-09T13:13:58.000Z
Fix TestNewBinaryIOCleanup on Go 1.23 and Linux 5.4
diff --git 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:]...)
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,8 @@ func descriptorCount(t *testing.T) int {`
`88`	`88`	`continue`
`89`	`89`	`}`
`90`	`90`
`91`		`- if strings.HasPrefix(sym, "pidfd:") {`
	`91`	`+ if strings.Contains(sym, "pidfd") {`
	`92`	`+ // Either pidfd:[70517] or anon_inode:[pidfd] (on Linux 5.4)`
`92`	`93`	`files = append(files[:i], files[i+1:]...)`
`93`	`94`	`}`
`94`	`95`	`}`