github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 21:53:52 +00:00
Code Issues Projects Releases Wiki Activity

add expectedDevice as arg for testing

Browse Source
This commit is contained in:
elbehery
2021-04-23 12:36:01 +02:00
parent f9befb90a4
commit 859fe6899c
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/volume/nfs/nfs_test.go
View File

@@ -96,7 +96,7 @@ func TestRecycler(t *testing.T) {
} }
} }
func doTestPlugin(t *testing.T, spec *volume.Spec) { func doTestPlugin(t *testing.T, spec *volume.Spec, expectedDevice string) {
tmpDir, err := utiltesting.MkTmpdir("nfs_test") tmpDir, err := utiltesting.MkTmpdir("nfs_test")
if err != nil { if err != nil {
t.Fatalf("error creating temp dir: %v", err) t.Fatalf("error creating temp dir: %v", err)
@@ -146,9 +146,6 @@ func doTestPlugin(t *testing.T, spec *volume.Spec) {
if mntDevs[0].Type != "nfs" { if mntDevs[0].Type != "nfs" {
t.Errorf("unexpected type of mounted devices. expected: %v, got %v", "nfs", mntDevs[0].Type) t.Errorf("unexpected type of mounted devices. expected: %v, got %v", "nfs", mntDevs[0].Type)
} }
src, _, _ := getVolumeSource(spec)
srvr := getServerFromSource(src)
expectedDevice := fmt.Sprintf("%s:%s", srvr, src.Path)
if mntDevs[0].Device != expectedDevice { if mntDevs[0].Device != expectedDevice {
t.Errorf("unexpected nfs device, expected %q, got: %q", expectedDevice, mntDevs[0].Device) t.Errorf("unexpected nfs device, expected %q, got: %q", expectedDevice, mntDevs[0].Device)
} }
@@ -195,7 +192,7 @@ func TestPluginVolume(t *testing.T) {
Name: "vol1", Name: "vol1",
VolumeSource: v1.VolumeSource{NFS: &v1.NFSVolumeSource{Server: "localhost", Path: "/somepath", ReadOnly: false}}, VolumeSource: v1.VolumeSource{NFS: &v1.NFSVolumeSource{Server: "localhost", Path: "/somepath", ReadOnly: false}},
} }
doTestPlugin(t, volume.NewSpecFromVolume(vol)) doTestPlugin(t, volume.NewSpecFromVolume(vol), "localhost:/somepath")
} }
func TestIPV6VolumeSource(t *testing.T) { func TestIPV6VolumeSource(t *testing.T) {
@@ -203,7 +200,7 @@ func TestIPV6VolumeSource(t *testing.T) {
Name: "vol1", Name: "vol1",
VolumeSource: v1.VolumeSource{NFS: &v1.NFSVolumeSource{Server: "0:0:0:0:0:0:0:1", Path: "/somepath", ReadOnly: false}}, VolumeSource: v1.VolumeSource{NFS: &v1.NFSVolumeSource{Server: "0:0:0:0:0:0:0:1", Path: "/somepath", ReadOnly: false}},
} }
doTestPlugin(t, volume.NewSpecFromVolume(vol)) doTestPlugin(t, volume.NewSpecFromVolume(vol), "[0:0:0:0:0:0:0:1]:/somepath")
} }
func TestIPV4VolumeSource(t *testing.T) { func TestIPV4VolumeSource(t *testing.T) {
@@ -211,7 +208,7 @@ func TestIPV4VolumeSource(t *testing.T) {
Name: "vol1", Name: "vol1",
VolumeSource: v1.VolumeSource{NFS: &v1.NFSVolumeSource{Server: "127.0.0.1", Path: "/somepath", ReadOnly: false}}, VolumeSource: v1.VolumeSource{NFS: &v1.NFSVolumeSource{Server: "127.0.0.1", Path: "/somepath", ReadOnly: false}},
} }
doTestPlugin(t, volume.NewSpecFromVolume(vol)) doTestPlugin(t, volume.NewSpecFromVolume(vol), "127.0.0.1:/somepath")
} }
func TestPluginPersistentVolume(t *testing.T) { func TestPluginPersistentVolume(t *testing.T) {
@@ -226,7 +223,7 @@ func TestPluginPersistentVolume(t *testing.T) {
}, },
} }
doTestPlugin(t, volume.NewSpecFromPersistentVolume(vol, false)) doTestPlugin(t, volume.NewSpecFromPersistentVolume(vol, false), "localhost:/somepath")
} }
func TestPersistentClaimReadOnlyFlag(t *testing.T) { func TestPersistentClaimReadOnlyFlag(t *testing.T) {