diff options
author | Ayush Ranjan <ayushranjan@google.com> | 2021-03-03 10:23:55 -0800 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2021-03-03 10:25:58 -0800 |
commit | a9441aea2780da8c93da1c73da860219f98438de (patch) | |
tree | 8b12915756f5bfb926218214cd7bc0b3281605fd /pkg/fd/fd_test.go | |
parent | b8a5420f49a2afd622ec08b5019e1bf537f7da82 (diff) |
[op] Replace syscall package usage with golang.org/x/sys/unix in pkg/.
The syscall package has been deprecated in favor of golang.org/x/sys.
Note that syscall is still used in the following places:
- pkg/sentry/socket/hostinet/stack.go: some netlink related functionalities
are not yet available in golang.org/x/sys.
- syscall.Stat_t is still used in some places because os.FileInfo.Sys() still
returns it and not unix.Stat_t.
Updates #214
PiperOrigin-RevId: 360701387
Diffstat (limited to 'pkg/fd/fd_test.go')
-rw-r--r-- | pkg/fd/fd_test.go | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/pkg/fd/fd_test.go b/pkg/fd/fd_test.go index 5fb0ad47d..da71364d4 100644 --- a/pkg/fd/fd_test.go +++ b/pkg/fd/fd_test.go @@ -17,8 +17,9 @@ package fd import ( "math" "os" - "syscall" "testing" + + "golang.org/x/sys/unix" ) func TestSetNegOne(t *testing.T) { @@ -29,22 +30,22 @@ func TestSetNegOne(t *testing.T) { } var tests []entry - fd, err := syscall.Socket(syscall.AF_UNIX, syscall.SOCK_STREAM|syscall.SOCK_CLOEXEC, 0) + fd, err := unix.Socket(unix.AF_UNIX, unix.SOCK_STREAM|unix.SOCK_CLOEXEC, 0) if err != nil { - t.Fatal("syscall.Socket:", err) + t.Fatal("unix.Socket:", err) } f1 := New(fd) tests = append(tests, entry{ "Release", f1, func() error { - return syscall.Close(f1.Release()) + return unix.Close(f1.Release()) }, }) - fd, err = syscall.Socket(syscall.AF_UNIX, syscall.SOCK_STREAM|syscall.SOCK_CLOEXEC, 0) + fd, err = unix.Socket(unix.AF_UNIX, unix.SOCK_STREAM|unix.SOCK_CLOEXEC, 0) if err != nil { - t.Fatal("syscall.Socket:", err) + t.Fatal("unix.Socket:", err) } f2 := New(fd) tests = append(tests, entry{ @@ -85,9 +86,9 @@ func TestStartsNegOne(t *testing.T) { } func TestFileDotFile(t *testing.T) { - fd, err := syscall.Socket(syscall.AF_UNIX, syscall.SOCK_STREAM|syscall.SOCK_CLOEXEC, 0) + fd, err := unix.Socket(unix.AF_UNIX, unix.SOCK_STREAM|unix.SOCK_CLOEXEC, 0) if err != nil { - t.Fatal("syscall.Socket:", err) + t.Fatal("unix.Socket:", err) } f := New(fd) |