Fix TestNewBinaryIOCleanup on Go 1.23 and Linux 5.4

zhsj · zhsj · commit 4fd7d4eef143 · 2024-08-14T16:54:23.000+08:00
When running the test on Ubuntu focal (kernel version 5.4), the symlink for pidfd is anon_inode:[pidfd]. Updates: #10345 Signed-off-by: Shengjing Zhu <zhsj@debian.org> (cherry picked from commit 8ef73c5) Signed-off-by: Shengjing Zhu <zhsj@debian.org>
diff --git a/pkg/process/io_test.go b/pkg/process/io_test.go
@@ -89,7 +89,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
`@@ -89,7 +89,8 @@ func descriptorCount(t *testing.T) int {`
`89`	`89`	`continue`
`90`	`90`	`}`
`91`	`91`
`92`		`- if strings.HasPrefix(sym, "pidfd:") {`
	`92`	`+ if strings.Contains(sym, "pidfd") {`
	`93`	`+ // Either pidfd:[70517] or anon_inode:[pidfd] (on Linux 5.4)`
`93`	`94`	`files = append(files[:i], files[i+1:]...)`
`94`	`95`	`}`
`95`	`96`	`}`