From a6600be34ad812ff13c89f45c3cadaac6d994e67 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Mon, 30 Mar 2026 18:15:56 +0900 Subject: all: use filepath This makes package check portable, and removes nonportable behaviour from package pkg, pipewire, and system. All other packages remain nonportable due to their nature. No latency increase was observed due to this change on amd64 and arm64 linux. Signed-off-by: Ophestra --- container/path_test.go | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'container/path_test.go') diff --git a/container/path_test.go b/container/path_test.go index 7f28b5f4..03406fb0 100644 --- a/container/path_test.go +++ b/container/path_test.go @@ -4,7 +4,7 @@ import ( "io" "math" "os" - "path" + "path/filepath" "reflect" "syscall" "testing" @@ -61,7 +61,7 @@ func TestCreateFile(t *testing.T) { Path: "/proc/nonexistent", Err: syscall.ENOENT, } - if err := createFile(path.Join(Nonexistent, ":3"), 0644, 0755, nil); !reflect.DeepEqual(err, wantErr) { + if err := createFile(filepath.Join(Nonexistent, ":3"), 0644, 0755, nil); !reflect.DeepEqual(err, wantErr) { t.Errorf("createFile: error = %#v, want %#v", err, wantErr) } }) @@ -72,7 +72,7 @@ func TestCreateFile(t *testing.T) { Path: "/proc/nonexistent", Err: syscall.ENOENT, } - if err := createFile(path.Join(Nonexistent), 0644, 0755, nil); !reflect.DeepEqual(err, wantErr) { + if err := createFile(filepath.Join(Nonexistent), 0644, 0755, nil); !reflect.DeepEqual(err, wantErr) { t.Errorf("createFile: error = %#v, want %#v", err, wantErr) } }) @@ -80,7 +80,7 @@ func TestCreateFile(t *testing.T) { t.Run("touch", func(t *testing.T) { tempDir := t.TempDir() - pathname := path.Join(tempDir, "empty") + pathname := filepath.Join(tempDir, "empty") if err := createFile(pathname, 0644, 0755, nil); err != nil { t.Fatalf("createFile: error = %v", err) } @@ -93,7 +93,7 @@ func TestCreateFile(t *testing.T) { t.Run("write", func(t *testing.T) { tempDir := t.TempDir() - pathname := path.Join(tempDir, "zero") + pathname := filepath.Join(tempDir, "zero") if err := createFile(pathname, 0644, 0755, []byte{0}); err != nil { t.Fatalf("createFile: error = %v", err) } @@ -107,7 +107,7 @@ func TestCreateFile(t *testing.T) { func TestEnsureFile(t *testing.T) { t.Run("create", func(t *testing.T) { - if err := ensureFile(path.Join(t.TempDir(), "ensure"), 0644, 0755); err != nil { + if err := ensureFile(filepath.Join(t.TempDir(), "ensure"), 0644, 0755); err != nil { t.Errorf("ensureFile: error = %v", err) } }) @@ -115,7 +115,7 @@ func TestEnsureFile(t *testing.T) { t.Run("stat", func(t *testing.T) { t.Run("inaccessible", func(t *testing.T) { tempDir := t.TempDir() - pathname := path.Join(tempDir, "inaccessible") + pathname := filepath.Join(tempDir, "inaccessible") if f, err := os.Create(pathname); err != nil { t.Fatalf("Create: error = %v", err) } else { @@ -150,7 +150,7 @@ func TestEnsureFile(t *testing.T) { t.Run("ensure", func(t *testing.T) { tempDir := t.TempDir() - pathname := path.Join(tempDir, "ensure") + pathname := filepath.Join(tempDir, "ensure") if f, err := os.Create(pathname); err != nil { t.Fatalf("Create: error = %v", err) } else { @@ -195,12 +195,12 @@ func TestProcPaths(t *testing.T) { t.Run("sample", func(t *testing.T) { tempDir := t.TempDir() - if err := os.MkdirAll(path.Join(tempDir, "proc/self"), 0755); err != nil { + if err := os.MkdirAll(filepath.Join(tempDir, "proc/self"), 0755); err != nil { t.Fatalf("MkdirAll: error = %v", err) } t.Run("clean", func(t *testing.T) { - if err := os.WriteFile(path.Join(tempDir, "proc/self/mountinfo"), []byte(`15 20 0:3 / /proc rw,relatime - proc /proc rw + if err := os.WriteFile(filepath.Join(tempDir, "proc/self/mountinfo"), []byte(`15 20 0:3 / /proc rw,relatime - proc /proc rw 16 20 0:15 / /sys rw,relatime - sysfs /sys rw 17 20 0:5 / /dev rw,relatime - devtmpfs udev rw,size=1983516k,nr_inodes=495879,mode=755`), 0644); err != nil { t.Fatalf("WriteFile: error = %v", err) @@ -243,8 +243,8 @@ func TestProcPaths(t *testing.T) { }) t.Run("malformed", func(t *testing.T) { - path.Join(tempDir, "proc/self/mountinfo") - if err := os.WriteFile(path.Join(tempDir, "proc/self/mountinfo"), []byte{0}, 0644); err != nil { + filepath.Join(tempDir, "proc/self/mountinfo") + if err := os.WriteFile(filepath.Join(tempDir, "proc/self/mountinfo"), []byte{0}, 0644); err != nil { t.Fatalf("WriteFile: error = %v", err) } -- cgit v1.3.1