github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix when os.Remove should be os.RemoveAll

Browse Source 
Signed-off-by: Jess Frazelle <acidburn@google.com>
This commit is contained in:
Jess Frazelle
2016-12-14 15:52:18 -08:00
parent 7db9c8b454
commit db75904b42
5 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/master/manifests_test.go
View File

@@ -33,7 +33,7 @@ func TestWriteStaticPodManifests(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("Couldn't create tmpdir") t.Fatalf("Couldn't create tmpdir")
} }
defer os.Remove(tmpdir) defer os.RemoveAll(tmpdir)
// set up tmp GlobalEnvParams values for testing // set up tmp GlobalEnvParams values for testing
oldEnv := kubeadmapi.GlobalEnvParams oldEnv := kubeadmapi.GlobalEnvParams

2
cmd/kubeadm/app/phases/certs/pki_helpers_test.go
View File

@@ -121,7 +121,7 @@ func TestWriteKeysAndCert(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("Couldn't create tmpdir") t.Fatalf("Couldn't create tmpdir")
} }
defer os.Remove(tmpdir) defer os.RemoveAll(tmpdir)
caKey, err := rsa.GenerateKey(rand.Reader, 2048) caKey, err := rsa.GenerateKey(rand.Reader, 2048)
if err != nil { if err != nil {

2
cmd/kubeadm/app/phases/kubeconfig/kubeconfig_test.go
View File

@@ -142,7 +142,7 @@ func TestWriteKubeconfigToDisk(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("Couldn't create tmpdir") t.Fatalf("Couldn't create tmpdir")
} }
defer os.Remove(tmpdir) defer os.RemoveAll(tmpdir)
// set up tmp GlobalEnvParams values for testing // set up tmp GlobalEnvParams values for testing
oldEnv := kubeadmapi.GlobalEnvParams oldEnv := kubeadmapi.GlobalEnvParams

7
pkg/client/unversioned/clientcmd/loader_test.go
View File

@@ -129,7 +129,7 @@ func TestErrorReadingNonFile(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("Couldn't create tmpdir") t.Fatalf("Couldn't create tmpdir")
} }
defer os.Remove(tmpdir) defer os.RemoveAll(tmpdir)
loadingRules := ClientConfigLoadingRules{ loadingRules := ClientConfigLoadingRules{
ExplicitPath: tmpdir, ExplicitPath: tmpdir,
@@ -224,14 +224,15 @@ func TestResolveRelativePaths(t *testing.T) {
} }
configDir1, _ := ioutil.TempDir("", "") configDir1, _ := ioutil.TempDir("", "")
defer os.RemoveAll(configDir1)
configFile1 := path.Join(configDir1, ".kubeconfig") configFile1 := path.Join(configDir1, ".kubeconfig")
configDir1, _ = filepath.Abs(configDir1) configDir1, _ = filepath.Abs(configDir1)
defer os.Remove(configFile1)
configDir2, _ := ioutil.TempDir("", "") configDir2, _ := ioutil.TempDir("", "")
defer os.RemoveAll(configDir2)
configDir2, _ = ioutil.TempDir(configDir2, "") configDir2, _ = ioutil.TempDir(configDir2, "")
configFile2 := path.Join(configDir2, ".kubeconfig") configFile2 := path.Join(configDir2, ".kubeconfig")
configDir2, _ = filepath.Abs(configDir2) configDir2, _ = filepath.Abs(configDir2)
defer os.Remove(configFile2)
WriteToFile(pathResolutionConfig1, configFile1) WriteToFile(pathResolutionConfig1, configFile1)
WriteToFile(pathResolutionConfig2, configFile2) WriteToFile(pathResolutionConfig2, configFile2)

1
pkg/kubelet/cm/container_manager_linux_test.go
View File

@@ -152,6 +152,7 @@ func TestSoftRequirementsValidationSuccess(t *testing.T) {
req := require.New(t) req := require.New(t)
tempDir, err := ioutil.TempDir("", "") tempDir, err := ioutil.TempDir("", "")
req.NoError(err) req.NoError(err)
defer os.RemoveAll(tempDir)
req.NoError(ioutil.WriteFile(path.Join(tempDir, "cpu.cfs_period_us"), []byte("0"), os.ModePerm)) req.NoError(ioutil.WriteFile(path.Join(tempDir, "cpu.cfs_period_us"), []byte("0"), os.ModePerm))
req.NoError(ioutil.WriteFile(path.Join(tempDir, "cpu.cfs_quota_us"), []byte("0"), os.ModePerm)) req.NoError(ioutil.WriteFile(path.Join(tempDir, "cpu.cfs_quota_us"), []byte("0"), os.ModePerm))
mountInt := &fakeMountInterface{ mountInt := &fakeMountInterface{