0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #45874 from thaJeztah/integration_no_sys

Browse source 
integration: don't use pkg/system MkNod/mkDev
This commit is contained in:
Sebastiaan van Stijn 2023-07-03 23:53:21 +02:00 • committed by GitHub
commit 6dff1b8c82
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
integration/container/run_linux_test.go
View file

@ -17,7 +17,6 @@ import (
"github.com/docker/docker/integration/internal/container"
net "github.com/docker/docker/integration/internal/network"
"github.com/docker/docker/pkg/stdcopy"
"github.com/docker/docker/pkg/system"
"github.com/docker/docker/testutil/daemon"
"golang.org/x/sys/unix"
"gotest.tools/v3/assert"
@ -155,7 +154,7 @@ func TestPrivilegedHostDevices(t *testing.T) {
)
// Create Null devices.
if err := system.Mknod(devTest, unix.S_IFCHR|0o600, int(system.Mkdev(1, 3))); err != nil {
if err := unix.Mknod(devTest, unix.S_IFCHR|0o600, int(unix.Mkdev(1, 3))); err != nil {
t.Fatal(err)
}
defer os.Remove(devTest)
@ -163,7 +162,7 @@ func TestPrivilegedHostDevices(t *testing.T) {
t.Fatal(err)
}
defer os.RemoveAll(filepath.Dir(devRootOnlyTest))
if err := system.Mknod(devRootOnlyTest, unix.S_IFCHR|0o600, int(system.Mkdev(1, 3))); err != nil {
if err := unix.Mknod(devRootOnlyTest, unix.S_IFCHR|0o600, int(unix.Mkdev(1, 3))); err != nil {
t.Fatal(err)
}
defer os.Remove(devRootOnlyTest)