summaryrefslogtreecommitdiffhomepage
path: root/pkg/errors
diff options
context:
space:
mode:
Diffstat (limited to 'pkg/errors')
-rw-r--r--pkg/errors/BUILD10
-rw-r--r--pkg/errors/errors_state_autogen.go3
-rw-r--r--pkg/errors/linuxerr/BUILD27
-rw-r--r--pkg/errors/linuxerr/linuxerr_state_autogen.go3
-rw-r--r--pkg/errors/linuxerr/linuxerr_test.go268
5 files changed, 6 insertions, 305 deletions
diff --git a/pkg/errors/BUILD b/pkg/errors/BUILD
deleted file mode 100644
index 36ea5da0c..000000000
--- a/pkg/errors/BUILD
+++ /dev/null
@@ -1,10 +0,0 @@
-load("//tools:defs.bzl", "go_library")
-
-package(licenses = ["notice"])
-
-go_library(
- name = "errors",
- srcs = ["errors.go"],
- visibility = ["//:sandbox"],
- deps = ["//pkg/abi/linux/errno"],
-)
diff --git a/pkg/errors/errors_state_autogen.go b/pkg/errors/errors_state_autogen.go
new file mode 100644
index 000000000..fd4538438
--- /dev/null
+++ b/pkg/errors/errors_state_autogen.go
@@ -0,0 +1,3 @@
+// automatically generated by stateify.
+
+package errors
diff --git a/pkg/errors/linuxerr/BUILD b/pkg/errors/linuxerr/BUILD
deleted file mode 100644
index 5b59ebd6e..000000000
--- a/pkg/errors/linuxerr/BUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-load("//tools:defs.bzl", "go_library", "go_test")
-
-package(licenses = ["notice"])
-
-go_library(
- name = "linuxerr",
- srcs = [
- "internal.go",
- "linuxerr.go",
- ],
- visibility = ["//visibility:public"],
- deps = [
- "//pkg/abi/linux/errno",
- "//pkg/errors",
- "@org_golang_x_sys//unix:go_default_library",
- ],
-)
-
-go_test(
- name = "linuxerr_test",
- srcs = ["linuxerr_test.go"],
- deps = [
- ":linuxerr",
- "//pkg/errors",
- "@org_golang_x_sys//unix:go_default_library",
- ],
-)
diff --git a/pkg/errors/linuxerr/linuxerr_state_autogen.go b/pkg/errors/linuxerr/linuxerr_state_autogen.go
new file mode 100644
index 000000000..8106a9d9f
--- /dev/null
+++ b/pkg/errors/linuxerr/linuxerr_state_autogen.go
@@ -0,0 +1,3 @@
+// automatically generated by stateify.
+
+package linuxerr
diff --git a/pkg/errors/linuxerr/linuxerr_test.go b/pkg/errors/linuxerr/linuxerr_test.go
deleted file mode 100644
index b99884b22..000000000
--- a/pkg/errors/linuxerr/linuxerr_test.go
+++ /dev/null
@@ -1,268 +0,0 @@
-// Copyright 2018 The gVisor Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package linuxerr_test
-
-import (
- "errors"
- "fmt"
- "io"
- "io/fs"
- "syscall"
- "testing"
-
- "golang.org/x/sys/unix"
- gErrors "gvisor.dev/gvisor/pkg/errors"
- "gvisor.dev/gvisor/pkg/errors/linuxerr"
-)
-
-var globalError error
-
-func BenchmarkAssignUnix(b *testing.B) {
- for i := b.N; i > 0; i-- {
- globalError = unix.EINVAL
- }
-}
-
-func BenchmarkAssignLinuxerr(b *testing.B) {
- for i := b.N; i > 0; i-- {
- globalError = linuxerr.EINVAL
- }
-}
-
-func BenchmarkCompareUnix(b *testing.B) {
- globalError = unix.EAGAIN
- j := 0
- for i := b.N; i > 0; i-- {
- if globalError == unix.EINVAL {
- j++
- }
- }
-}
-
-func BenchmarkCompareLinuxerr(b *testing.B) {
- globalError = linuxerr.E2BIG
- j := 0
- for i := b.N; i > 0; i-- {
- if globalError == linuxerr.EINVAL {
- j++
- }
- }
-}
-
-func BenchmarkSwitchUnix(b *testing.B) {
- globalError = unix.EPERM
- j := 0
- for i := b.N; i > 0; i-- {
- switch globalError {
- case unix.EINVAL:
- j++
- case unix.EINTR:
- j += 2
- case unix.EAGAIN:
- j += 3
- }
- }
-}
-
-func BenchmarkSwitchLinuxerr(b *testing.B) {
- globalError = linuxerr.EPERM
- j := 0
- for i := b.N; i > 0; i-- {
- switch globalError {
- case linuxerr.EINVAL:
- j++
- case linuxerr.EINTR:
- j += 2
- case linuxerr.EAGAIN:
- j += 3
- }
- }
-}
-
-func BenchmarkReturnUnix(b *testing.B) {
- var localError error
- f := func() error {
- return unix.EINVAL
- }
- for i := b.N; i > 0; i-- {
- localError = f()
- }
- if localError != nil {
- return
- }
-}
-
-func BenchmarkReturnLinuxerr(b *testing.B) {
- var localError error
- f := func() error {
- return linuxerr.EINVAL
- }
- for i := b.N; i > 0; i-- {
- localError = f()
- }
- if localError != nil {
- return
- }
-}
-
-func BenchmarkConvertUnixLinuxerr(b *testing.B) {
- var localError error
- for i := b.N; i > 0; i-- {
- localError = linuxerr.ErrorFromUnix(unix.EINVAL)
- }
- if localError != nil {
- return
- }
-}
-
-func BenchmarkConvertUnixLinuxerrZero(b *testing.B) {
- var localError error
- for i := b.N; i > 0; i-- {
- localError = linuxerr.ErrorFromUnix(unix.Errno(0))
- }
- if localError != nil {
- return
- }
-}
-
-type translationTestTable struct {
- errIn error
- expectedBool bool
- expectedTranslation *gErrors.Error
-}
-
-func TestErrorTranslation(t *testing.T) {
- testTable := []translationTestTable{
- {
- errIn: linuxerr.ENOENT,
- },
- {
- errIn: unix.ENOENT,
- },
- {
- errIn: linuxerr.ErrInterrupted,
- expectedBool: true,
- expectedTranslation: linuxerr.EINTR,
- },
- {
- errIn: linuxerr.ERESTART_RESTARTBLOCK,
- },
- {
- errIn: errors.New("some new error"),
- },
- }
- for _, tt := range testTable {
- t.Run(fmt.Sprintf("err: %v %T", tt.errIn, tt.errIn), func(t *testing.T) {
- err, ok := linuxerr.TranslateError(tt.errIn)
- if (!tt.expectedBool && err != nil) || (tt.expectedBool != ok) {
- t.Fatalf("%v => %v %v expected %v err: nil", tt.errIn, err, ok, tt.expectedBool)
- } else if err != tt.expectedTranslation {
- t.Fatalf("%v => %v expected %v", tt.errIn, err, tt.expectedTranslation)
- }
- })
- }
-}
-
-func TestSyscallErrnoToErrors(t *testing.T) {
- for _, tc := range []struct {
- errno syscall.Errno
- err error
- }{
- {errno: syscall.EACCES, err: linuxerr.EACCES},
- {errno: syscall.EAGAIN, err: linuxerr.EAGAIN},
- {errno: syscall.EBADF, err: linuxerr.EBADF},
- {errno: syscall.EBUSY, err: linuxerr.EBUSY},
- {errno: syscall.EDOM, err: linuxerr.EDOM},
- {errno: syscall.EEXIST, err: linuxerr.EEXIST},
- {errno: syscall.EFAULT, err: linuxerr.EFAULT},
- {errno: syscall.EFBIG, err: linuxerr.EFBIG},
- {errno: syscall.EINTR, err: linuxerr.EINTR},
- {errno: syscall.EINVAL, err: linuxerr.EINVAL},
- {errno: syscall.EIO, err: linuxerr.EIO},
- {errno: syscall.ENOTDIR, err: linuxerr.ENOTDIR},
- {errno: syscall.ENOTTY, err: linuxerr.ENOTTY},
- {errno: syscall.EPERM, err: linuxerr.EPERM},
- {errno: syscall.EPIPE, err: linuxerr.EPIPE},
- {errno: syscall.ESPIPE, err: linuxerr.ESPIPE},
- {errno: syscall.EWOULDBLOCK, err: linuxerr.EAGAIN},
- } {
- t.Run(tc.errno.Error(), func(t *testing.T) {
- e := linuxerr.ErrorFromUnix(unix.Errno(tc.errno))
- if e != tc.err {
- t.Fatalf("Mismatch errors: want: %+v %T got: %+v %T", tc.err, tc.err, e, e)
- }
- })
- }
-}
-
-// TestEqualsMethod tests that the Equals method correctly compares syerror,
-// unix.Errno and linuxerr.
-// TODO (b/34162363): Remove this.
-func TestEqualsMethod(t *testing.T) {
- noError := linuxerr.ErrorFromUnix(unix.Errno(0))
- for _, tc := range []struct {
- name string
- linuxErr []*gErrors.Error
- err []error
- equal bool
- }{
- {
- name: "compare nil",
- linuxErr: []*gErrors.Error{nil},
- err: []error{nil, noError, unix.Errno(0)},
- equal: true,
- },
- {
- name: "linuxerr nil error not",
- linuxErr: []*gErrors.Error{nil},
- err: []error{unix.Errno(1), linuxerr.EPERM, linuxerr.EACCES},
- equal: false,
- },
- {
- name: "linuxerr not nil error nil",
- linuxErr: []*gErrors.Error{linuxerr.ENOENT},
- err: []error{nil, unix.Errno(0)},
- equal: false,
- },
- {
- name: "equal errors",
- linuxErr: []*gErrors.Error{linuxerr.ESRCH},
- err: []error{linuxerr.ESRCH, linuxerr.ESRCH, unix.Errno(linuxerr.ESRCH.Errno())},
- equal: true,
- },
- {
- name: "unequal errors",
- linuxErr: []*gErrors.Error{linuxerr.ENOENT},
- err: []error{linuxerr.ESRCH, linuxerr.ESRCH, unix.Errno(linuxerr.ESRCH.Errno())},
- equal: false,
- },
- {
- name: "other error",
- linuxErr: []*gErrors.Error{nil, linuxerr.E2BIG, linuxerr.EINVAL},
- err: []error{fs.ErrInvalid, io.EOF},
- equal: false,
- },
- } {
- t.Run(tc.name, func(t *testing.T) {
- for _, le := range tc.linuxErr {
- for _, e := range tc.err {
- if linuxerr.Equals(le, e) != tc.equal {
- t.Fatalf("Expected %t from Equals method for linuxerr: %s %T and error: %s %T", tc.equal, le, le, e, e)
- }
- }
- }
- })
- }
-}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-23 13:21:37 +0000