diff options
author | Eng Zer Jun <engzerjun@gmail.com> | 2021-08-24 18:10:50 +0800 |
---|---|---|
committer | Eng Zer Jun <engzerjun@gmail.com> | 2021-08-27 14:56:57 +0800 |
commit | c55a4ac7795c7606b548b38e24673733481e2167 (patch) | |
tree | 8ea03bdc842959cd3d04a3e37a4ce2a71fa77dbb /integration-cli/docker_cli_save_load_test.go | |
parent | 2b70006e3bfa492b8641ff443493983d832955f4 (diff) | |
download | docker-c55a4ac7795c7606b548b38e24673733481e2167.tar.gz |
refactor: move from io/ioutil to io and os package
The io/ioutil package has been deprecated in Go 1.16. This commit
replaces the existing io/ioutil functions with their new definitions in
io and os packages.
Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>
Diffstat (limited to 'integration-cli/docker_cli_save_load_test.go')
-rw-r--r-- | integration-cli/docker_cli_save_load_test.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/integration-cli/docker_cli_save_load_test.go b/integration-cli/docker_cli_save_load_test.go index 5f32d1c1d2..eac6fb054c 100644 --- a/integration-cli/docker_cli_save_load_test.go +++ b/integration-cli/docker_cli_save_load_test.go @@ -5,7 +5,6 @@ import ( "encoding/json" "fmt" "io" - "io/ioutil" "os" "os/exec" "path/filepath" @@ -262,7 +261,7 @@ func (s *DockerSuite) TestSaveDirectoryPermissions(c *testing.T) { layerEntriesAUFS := []string{"./", ".wh..wh.aufs", ".wh..wh.orph/", ".wh..wh.plnk/", "opt/", "opt/a/", "opt/a/b/", "opt/a/b/c"} name := "save-directory-permissions" - tmpDir, err := ioutil.TempDir("", "save-layers-with-directories") + tmpDir, err := os.MkdirTemp("", "save-layers-with-directories") assert.Assert(c, err == nil, "failed to create temporary directory: %s", err) extractionDirectory := filepath.Join(tmpDir, "image-extraction-dir") os.Mkdir(extractionDirectory, 0777) @@ -278,7 +277,7 @@ func (s *DockerSuite) TestSaveDirectoryPermissions(c *testing.T) { ) assert.NilError(c, err, "failed to save and extract image: %s", out) - dirs, err := ioutil.ReadDir(extractionDirectory) + dirs, err := os.ReadDir(extractionDirectory) assert.NilError(c, err, "failed to get a listing of the layer directories: %s", err) found := false @@ -358,7 +357,7 @@ func (s *DockerSuite) TestSaveLoadParents(c *testing.T) { idFoo := makeImage("busybox", "foo") idBar := makeImage(idFoo, "bar") - tmpDir, err := ioutil.TempDir("", "save-load-parents") + tmpDir, err := os.MkdirTemp("", "save-load-parents") assert.NilError(c, err) defer os.RemoveAll(tmpDir) |