Merge pull request containerd#10591 from zhsj/bpo-10562-1.6

[release/1.6] Fix TestNewBinaryIOCleanup on Go 1.23 and Linux 5.4
Mirantis · Aug 14, 2024 · 7a530d2 · 7a530d2
2 parents 2958525 + 4fd7d4e
commit 7a530d2
Showing 1 changed file with 2 additions and 1 deletion.
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:]...)
  }
  }