github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 18:24:07 +00:00
Code Issues Projects Releases Wiki Activity

Fix host path test clean up

Browse Source
This commit is contained in:
caiweidong 2019-07-10 17:24:47 +08:00
parent abe94ce9b3
commit 7dee721a3e
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/volume/hostpath/host_path_test.go
View File

@ -19,6 +19,7 @@ package hostpath
import ( import (
"fmt" "fmt"
"os" "os"
"path/filepath"
"testing" "testing"
"k8s.io/api/core/v1" "k8s.io/api/core/v1"
@ -97,13 +98,12 @@ func TestRecycler(t *testing.T) {
func TestDeleter(t *testing.T) { func TestDeleter(t *testing.T) {
// Deleter has a hard-coded regex for "/tmp". // Deleter has a hard-coded regex for "/tmp".
tempPath := fmt.Sprintf("/tmp/hostpath/%s", uuid.NewUUID()) tempPath := fmt.Sprintf("/tmp/hostpath.%s", uuid.NewUUID())
defer os.RemoveAll(tempPath)
err := os.MkdirAll(tempPath, 0750) err := os.MkdirAll(tempPath, 0750)
if err != nil { if err != nil {
t.Fatalf("Failed to create tmp directory for deleter: %v", err) t.Fatalf("Failed to create tmp directory for deleter: %v", err)
} }
defer os.RemoveAll(tempPath)
plugMgr := volume.VolumePluginMgr{} plugMgr := volume.VolumePluginMgr{}
plugMgr.InitPlugins(ProbeVolumePlugins(volume.VolumeConfig{}), nil /* prober */, volumetest.NewFakeVolumeHost("/tmp/fake", nil, nil)) plugMgr.InitPlugins(ProbeVolumePlugins(volume.VolumeConfig{}), nil /* prober */, volumetest.NewFakeVolumeHost("/tmp/fake", nil, nil))
@ -154,12 +154,7 @@ func TestDeleterTempDir(t *testing.T) {
} }
func TestProvisioner(t *testing.T) { func TestProvisioner(t *testing.T) {
tempPath := fmt.Sprintf("/tmp/hostpath/%s", uuid.NewUUID()) tempPath := fmt.Sprintf("/tmp/hostpath.%s", uuid.NewUUID())
defer os.RemoveAll(tempPath)
err := os.MkdirAll(tempPath, 0750)
if err != nil {
t.Errorf("Failed to create tempPath %s error:%v", tempPath, err)
}
plugMgr := volume.VolumePluginMgr{} plugMgr := volume.VolumePluginMgr{}
plugMgr.InitPlugins(ProbeVolumePlugins(volume.VolumeConfig{ProvisioningEnabled: true}), plugMgr.InitPlugins(ProbeVolumePlugins(volume.VolumeConfig{ProvisioningEnabled: true}),
nil, nil,
@ -173,11 +168,11 @@ func TestProvisioner(t *testing.T) {
PVC: volumetest.CreateTestPVC("1Gi", []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce}), PVC: volumetest.CreateTestPVC("1Gi", []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce}),
PersistentVolumeReclaimPolicy: v1.PersistentVolumeReclaimDelete, PersistentVolumeReclaimPolicy: v1.PersistentVolumeReclaimDelete,
} }
creater, err := plug.NewProvisioner(options) creator, err := plug.NewProvisioner(options)
if err != nil { if err != nil {
t.Errorf("Failed to make a new Provisioner: %v", err) t.Errorf("Failed to make a new Provisioner: %v", err)
} }
pv, err := creater.Provision(nil, nil) pv, err := creator.Provision(nil, nil)
if err != nil { if err != nil {
t.Errorf("Unexpected error creating volume: %v", err) t.Errorf("Unexpected error creating volume: %v", err)
} }
@ -196,7 +191,9 @@ func TestProvisioner(t *testing.T) {
t.Errorf("Expected reclaim policy %+v but got %+v", v1.PersistentVolumeReclaimDelete, pv.Spec.PersistentVolumeReclaimPolicy) t.Errorf("Expected reclaim policy %+v but got %+v", v1.PersistentVolumeReclaimDelete, pv.Spec.PersistentVolumeReclaimPolicy)
} }
os.RemoveAll(pv.Spec.HostPath.Path) pvDir := filepath.Dir(pv.Spec.HostPath.Path)
os.RemoveAll(pvDir)
} }
func TestInvalidHostPath(t *testing.T) { func TestInvalidHostPath(t *testing.T) {