adds experimental sys.Errno to begin decoupling from the syscall package (#1582)

Signed-off-by: Adrian Cole <adrian@tetrate.io>
This commit is contained in:
Crypt Keeper
2023-07-17 08:13:29 +08:00
committed by GitHub
parent 1dafce0b2a
commit 2f8dd23097
94 changed files with 1591 additions and 1374 deletions

View File

@@ -1,4 +1,4 @@
package sys
package sys_test
import (
"context"
@@ -6,6 +6,7 @@ import (
"testing"
"github.com/tetratelabs/wazero/internal/testing/require"
"github.com/tetratelabs/wazero/sys"
)
type notExitError struct {
@@ -17,7 +18,7 @@ func (e *notExitError) Error() string {
}
func TestIs(t *testing.T) {
err := NewExitError(2)
err := sys.NewExitError(2)
tests := []struct {
name string
target error
@@ -30,7 +31,7 @@ func TestIs(t *testing.T) {
},
{
name: "different exit code",
target: NewExitError(1),
target: sys.NewExitError(1),
matches: false,
},
{
@@ -53,19 +54,19 @@ func TestIs(t *testing.T) {
func TestExitError_Error(t *testing.T) {
t.Run("timeout", func(t *testing.T) {
err := NewExitError(ExitCodeDeadlineExceeded)
require.Equal(t, ExitCodeDeadlineExceeded, err.ExitCode())
err := sys.NewExitError(sys.ExitCodeDeadlineExceeded)
require.Equal(t, sys.ExitCodeDeadlineExceeded, err.ExitCode())
require.EqualError(t, err, "module closed with context deadline exceeded")
require.ErrorIs(t, err, context.DeadlineExceeded, "exit code context deadline exceeded should work")
})
t.Run("cancel", func(t *testing.T) {
err := NewExitError(ExitCodeContextCanceled)
require.Equal(t, ExitCodeContextCanceled, err.ExitCode())
err := sys.NewExitError(sys.ExitCodeContextCanceled)
require.Equal(t, sys.ExitCodeContextCanceled, err.ExitCode())
require.EqualError(t, err, "module closed with context canceled")
require.ErrorIs(t, err, context.Canceled, "exit code context canceled should work")
})
t.Run("normal", func(t *testing.T) {
err := NewExitError(123)
err := sys.NewExitError(123)
require.Equal(t, uint32(123), err.ExitCode())
require.EqualError(t, err, "module closed with exit_code(123)")
})

3
sys/stat_export_test.go Normal file
View File

@@ -0,0 +1,3 @@
package sys
const SysParseable = sysParseable

View File

@@ -1,4 +1,4 @@
package sys
package sys_test
import (
"io/fs"
@@ -9,6 +9,7 @@ import (
"testing/fstest"
"github.com/tetratelabs/wazero/internal/testing/require"
"github.com/tetratelabs/wazero/sys"
)
func Test_NewStat_t(t *testing.T) {
@@ -30,7 +31,7 @@ func Test_NewStat_t(t *testing.T) {
osSymlinkInfo, err := os.Lstat(link)
require.NoError(t, err)
osFileSt := NewStat_t(osFileInfo)
osFileSt := sys.NewStat_t(osFileInfo)
testFS := fstest.MapFS{
"dir": {
Mode: osDirInfo.Mode(),
@@ -115,7 +116,7 @@ func Test_NewStat_t(t *testing.T) {
for _, tt := range tests {
tc := tt
t.Run(tc.name, func(t *testing.T) {
st := NewStat_t(tc.info)
st := sys.NewStat_t(tc.info)
if tc.expectDevIno && runtime.GOOS != "windows" {
require.NotEqual(t, uint64(0), st.Dev)
require.NotEqual(t, uint64(0), st.Ino)
@@ -127,7 +128,7 @@ func Test_NewStat_t(t *testing.T) {
// link mode may differ on windows, so mask
require.Equal(t, tc.expectedMode, st.Mode&tc.expectedMode)
if sysParseable && runtime.GOOS != "windows" {
if sys.SysParseable && runtime.GOOS != "windows" {
switch st.Nlink {
case 2, 4: // dirents may include dot entries.
require.Equal(t, fs.ModeDir, st.Mode.Type())
@@ -140,15 +141,15 @@ func Test_NewStat_t(t *testing.T) {
require.Equal(t, tc.expectedSize, st.Size)
if tc.expectAtimCtime && sysParseable {
if tc.expectAtimCtime && sys.SysParseable {
// We don't validate times strictly because it is os-dependent
// what updates times. There are edge cases for symlinks, too.
require.NotEqual(t, EpochNanos(0), st.Ctim)
require.NotEqual(t, EpochNanos(0), st.Mtim)
require.NotEqual(t, EpochNanos(0), st.Mtim)
require.NotEqual(t, sys.EpochNanos(0), st.Ctim)
require.NotEqual(t, sys.EpochNanos(0), st.Mtim)
require.NotEqual(t, sys.EpochNanos(0), st.Mtim)
} else { // mtim is used for atim and ctime
require.Equal(t, st.Mtim, st.Ctim)
require.NotEqual(t, EpochNanos(0), st.Mtim)
require.NotEqual(t, sys.EpochNanos(0), st.Mtim)
require.Equal(t, st.Mtim, st.Atim)
}
})