mirror of
https://github.com/netbirdio/gvisor.git
synced 2026-05-22 17:12:49 -07:00
Don't use task goroutine context in fsimpl tests.
PiperOrigin-RevId: 352908368
This commit is contained in:
@@ -393,7 +393,7 @@ func TestProcSelf(t *testing.T) {
|
||||
t.Fatalf("CreateTask(): %v", err)
|
||||
}
|
||||
|
||||
collector := s.WithTemporaryContext(task).ListDirents(&vfs.PathOperation{
|
||||
collector := s.WithTemporaryContext(task.AsyncContext()).ListDirents(&vfs.PathOperation{
|
||||
Root: s.Root,
|
||||
Start: s.Root,
|
||||
Path: fspath.Parse("/proc/self/"),
|
||||
@@ -491,11 +491,11 @@ func TestTree(t *testing.T) {
|
||||
t.Fatalf("CreateTask(): %v", err)
|
||||
}
|
||||
// Add file to populate /proc/[pid]/fd and fdinfo directories.
|
||||
task.FDTable().NewFDVFS2(task, 0, file, kernel.FDFlags{})
|
||||
task.FDTable().NewFDVFS2(task.AsyncContext(), 0, file, kernel.FDFlags{})
|
||||
tasks = append(tasks, task)
|
||||
}
|
||||
|
||||
ctx := tasks[0]
|
||||
ctx := tasks[0].AsyncContext()
|
||||
fd, err := s.VFS.OpenAt(
|
||||
ctx,
|
||||
auth.CredentialsFromContext(s.Ctx),
|
||||
|
||||
@@ -66,7 +66,7 @@ func dentryFromFD(t *testing.T, fd *vfs.FileDescription) *dentry {
|
||||
// newVerityRoot creates a new verity mount, and returns the root. The
|
||||
// underlying file system is tmpfs. If the error is not nil, then cleanup
|
||||
// should be called when the root is no longer needed.
|
||||
func newVerityRoot(t *testing.T, hashAlg HashAlgorithm) (*vfs.VirtualFilesystem, vfs.VirtualDentry, *kernel.Task, error) {
|
||||
func newVerityRoot(t *testing.T, hashAlg HashAlgorithm) (*vfs.VirtualFilesystem, vfs.VirtualDentry, context.Context, error) {
|
||||
t.Helper()
|
||||
k, err := testutil.Boot()
|
||||
if err != nil {
|
||||
@@ -119,7 +119,7 @@ func newVerityRoot(t *testing.T, hashAlg HashAlgorithm) (*vfs.VirtualFilesystem,
|
||||
root.DecRef(ctx)
|
||||
mntns.DecRef(ctx)
|
||||
})
|
||||
return vfsObj, root, task, nil
|
||||
return vfsObj, root, task.AsyncContext(), nil
|
||||
}
|
||||
|
||||
// openVerityAt opens a verity file.
|
||||
|
||||
Reference in New Issue
Block a user