From 3711359ab54e745cde20a640abd490408fe04704 Mon Sep 17 00:00:00 2001 From: mnussbaum Date: Tue, 27 Feb 2018 19:07:06 +0000 Subject: [PATCH] Clean-up after container unit test Remove temp directories and close file loggers in container unit tests. Signed-off-by: mnussbaum Upstream-commit: 07d5446fe27cb92d881df48be6e8a6510d9608b0 Component: engine --- components/engine/container/container_unit_test.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/components/engine/container/container_unit_test.go b/components/engine/container/container_unit_test.go index 858124abdb..863a47a1f2 100644 --- a/components/engine/container/container_unit_test.go +++ b/components/engine/container/container_unit_test.go @@ -3,6 +3,7 @@ package container // import "github.com/docker/docker/container" import ( "fmt" "io/ioutil" + "os" "path/filepath" "testing" @@ -74,6 +75,7 @@ func TestContainerSecretReferenceDestTarget(t *testing.T) { func TestContainerLogPathSetForJSONFileLogger(t *testing.T) { containerRoot, err := ioutil.TempDir("", "TestContainerLogPathSetForJSONFileLogger") require.NoError(t, err) + defer os.RemoveAll(containerRoot) c := &Container{ Config: &container.Config{}, @@ -86,8 +88,9 @@ func TestContainerLogPathSetForJSONFileLogger(t *testing.T) { Root: containerRoot, } - _, err = c.StartLogger() + logger, err := c.StartLogger() require.NoError(t, err) + defer logger.Close() expectedLogPath, err := filepath.Abs(filepath.Join(containerRoot, fmt.Sprintf("%s-json.log", c.ID))) require.NoError(t, err) @@ -97,6 +100,7 @@ func TestContainerLogPathSetForJSONFileLogger(t *testing.T) { func TestContainerLogPathSetForRingLogger(t *testing.T) { containerRoot, err := ioutil.TempDir("", "TestContainerLogPathSetForRingLogger") require.NoError(t, err) + defer os.RemoveAll(containerRoot) c := &Container{ Config: &container.Config{}, @@ -112,8 +116,9 @@ func TestContainerLogPathSetForRingLogger(t *testing.T) { Root: containerRoot, } - _, err = c.StartLogger() + logger, err := c.StartLogger() require.NoError(t, err) + defer logger.Close() expectedLogPath, err := filepath.Abs(filepath.Join(containerRoot, fmt.Sprintf("%s-json.log", c.ID))) require.NoError(t, err)