Prechádzať zdrojové kódy

Merge pull request #45874 from thaJeztah/integration_no_sys

integration: don't use pkg/system MkNod/mkDev
Sebastiaan van Stijn 2 rokov pred
rodič
commit
6dff1b8c82
1 zmenil súbory, kde vykonal 2 pridanie a 3 odobranie
  1. 2 3
      integration/container/run_linux_test.go

+ 2 - 3
integration/container/run_linux_test.go

@@ -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)