From be4eac753f1731b1a39b2e4d8cca43f2287cedeb Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Tue, 24 Dec 2024 22:01:05 -0800 Subject: [PATCH] Remove use of bufio in cli import tests The use of bufio for writing without flushing can lead to an incomplete writing of the tar and subsequent unexpected EOF when importing. Signed-off-by: Derek McGowan --- integration-cli/docker_cli_import_test.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/integration-cli/docker_cli_import_test.go b/integration-cli/docker_cli_import_test.go index 70f6f05cca..14a2c2c08f 100644 --- a/integration-cli/docker_cli_import_test.go +++ b/integration-cli/docker_cli_import_test.go @@ -1,7 +1,6 @@ package main import ( - "bufio" "compress/gzip" "context" "os" @@ -66,7 +65,7 @@ func (s *DockerCLIImportSuite) TestImportFile(c *testing.T) { icmd.RunCmd(icmd.Cmd{ Command: []string{dockerBinary, "export", "test-import"}, - Stdout: bufio.NewWriter(temporaryFile), + Stdout: temporaryFile, }).Assert(c, icmd.Success) out := cli.DockerCmd(c, "import", temporaryFile.Name()).Combined() @@ -110,7 +109,7 @@ func (s *DockerCLIImportSuite) TestImportFileWithMessage(c *testing.T) { icmd.RunCmd(icmd.Cmd{ Command: []string{dockerBinary, "export", "test-import"}, - Stdout: bufio.NewWriter(temporaryFile), + Stdout: temporaryFile, }).Assert(c, icmd.Success) message := "Testing commit message" @@ -144,7 +143,7 @@ func (s *DockerCLIImportSuite) TestImportWithQuotedChanges(c *testing.T) { assert.Assert(c, err == nil, "failed to create temporary file") defer os.Remove(temporaryFile.Name()) - cli.Docker(cli.Args("export", "test-import"), cli.WithStdout(bufio.NewWriter(temporaryFile))).Assert(c, icmd.Success) + cli.Docker(cli.Args("export", "test-import"), cli.WithStdout(temporaryFile)).Assert(c, icmd.Success) result := cli.DockerCmd(c, "import", "-c", `ENTRYPOINT ["/bin/sh", "-c"]`, temporaryFile.Name()) imgRef := strings.TrimSpace(result.Stdout())