From 7db9c8b454b163529acc6bc511fec05945623dba Mon Sep 17 00:00:00 2001 From: Jess Frazelle Date: Wed, 14 Dec 2016 16:47:53 -0800 Subject: [PATCH] cleanup fooPodContainerDir in /tmp Signed-off-by: Jess Frazelle --- pkg/kubelet/dockertools/docker_manager_test.go | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pkg/kubelet/dockertools/docker_manager_test.go b/pkg/kubelet/dockertools/docker_manager_test.go index 2f22a76bc34..c6021816de7 100644 --- a/pkg/kubelet/dockertools/docker_manager_test.go +++ b/pkg/kubelet/dockertools/docker_manager_test.go @@ -17,6 +17,7 @@ limitations under the License. package dockertools import ( + "flag" "fmt" "io/ioutil" "net" @@ -58,6 +59,21 @@ import ( "k8s.io/kubernetes/pkg/util/sets" ) +var testTempDir string + +func TestMain(m *testing.M) { + dir, err := ioutil.TempDir("", "dockertools") + if err != nil { + panic(err) + } + testTempDir = dir + + flag.Parse() + status := m.Run() + os.RemoveAll(testTempDir) + os.Exit(status) +} + type fakeHTTP struct { url string err error @@ -80,7 +96,7 @@ func (f *fakeRuntimeHelper) GenerateRunContainerOptions(pod *v1.Pod, container * var opts kubecontainer.RunContainerOptions var err error if len(container.TerminationMessagePath) != 0 { - testPodContainerDir, err = ioutil.TempDir("", "fooPodContainerDir") + testPodContainerDir, err = ioutil.TempDir(testTempDir, "fooPodContainerDir") if err != nil { return nil, err }