github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #80848 from cwdsuzhou/Aug/fix_ut

Browse Source 
Fix some unreasonable places int csi ut
This commit is contained in:
Kubernetes Prow Robot 2019-08-01 03:30:14 -07:00 committed by GitHub
commit 4ce69dd32e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/volume/csi/csi_mounter_test.go
View File

@ -84,10 +84,10 @@ func TestMounterGetPath(t *testing.T) {
} }
csiMounter := mounter.(*csiMountMgr) csiMounter := mounter.(*csiMountMgr)
path := csiMounter.GetPath() mountPath := csiMounter.GetPath()
if tc.path != path { if tc.path != mountPath {
t.Errorf("expecting path %s, got %s", tc.path, path) t.Errorf("expecting path %s, got %s", tc.path, mountPath)
} }
} }
} }
@ -226,10 +226,10 @@ func MounterSetUpTests(t *testing.T, podInfoEnabled bool) {
t.Errorf("default value of file system type was overridden by type %s", csiMounter.spec.PersistentVolume.Spec.CSI.FSType) t.Errorf("default value of file system type was overridden by type %s", csiMounter.spec.PersistentVolume.Spec.CSI.FSType)
} }
path := csiMounter.GetPath() mountPath := csiMounter.GetPath()
if _, err := os.Stat(path); err != nil { if _, err := os.Stat(mountPath); err != nil {
if os.IsNotExist(err) { if os.IsNotExist(err) {
t.Errorf("SetUp() failed, volume path not created: %s", path) t.Errorf("SetUp() failed, volume path not created: %s", mountPath)
} else { } else {
t.Errorf("SetUp() failed: %v", err) t.Errorf("SetUp() failed: %v", err)
} }

18
pkg/volume/csi/csi_plugin_test.go
View File

@ -549,12 +549,11 @@ func TestPluginNewMounter(t *testing.T) {
} }
for _, test := range tests { for _, test := range tests {
plug, tmpDir := newTestPlugin(t, nil)
defer os.RemoveAll(tmpDir)
registerFakePlugin(testDriver, "endpoint", []string{"1.2.0"}, t)
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
plug, tmpDir := newTestPlugin(t, nil)
defer os.RemoveAll(tmpDir)
registerFakePlugin(testDriver, "endpoint", []string{"1.2.0"}, t)
mounter, err := plug.NewMounter( mounter, err := plug.NewMounter(
test.spec, test.spec,
&api.Pod{ObjectMeta: meta.ObjectMeta{UID: test.podUID, Namespace: test.namespace}}, &api.Pod{ObjectMeta: meta.ObjectMeta{UID: test.podUID, Namespace: test.namespace}},
@ -668,12 +667,11 @@ func TestPluginNewMounterWithInline(t *testing.T) {
} }
for _, test := range tests { for _, test := range tests {
plug, tmpDir := newTestPlugin(t, nil)
defer os.RemoveAll(tmpDir)
registerFakePlugin(testDriver, "endpoint", []string{"1.2.0"}, t)
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
plug, tmpDir := newTestPlugin(t, nil)
defer os.RemoveAll(tmpDir)
registerFakePlugin(testDriver, "endpoint", []string{"1.2.0"}, t)
mounter, err := plug.NewMounter( mounter, err := plug.NewMounter(
test.spec, test.spec,
&api.Pod{ObjectMeta: meta.ObjectMeta{UID: test.podUID, Namespace: test.namespace}}, &api.Pod{ObjectMeta: meta.ObjectMeta{UID: test.podUID, Namespace: test.namespace}},

44
pkg/volume/csi/expander_test.go
View File

@ -64,31 +64,33 @@ func TestNodeExpand(t *testing.T) {
}, },
} }
for _, tc := range tests { for _, tc := range tests {
plug, tmpDir := newTestPlugin(t, nil) t.Run(tc.name, func(t *testing.T) {
defer os.RemoveAll(tmpDir) plug, tmpDir := newTestPlugin(t, nil)
defer os.RemoveAll(tmpDir)
spec := volume.NewSpecFromPersistentVolume(makeTestPV("test-pv", 10, "expandable", "test-vol"), false) spec := volume.NewSpecFromPersistentVolume(makeTestPV("test-pv", 10, "expandable", "test-vol"), false)
newSize, _ := resource.ParseQuantity("20Gi") newSize, _ := resource.ParseQuantity("20Gi")
resizeOptions := volume.NodeResizeOptions{ resizeOptions := volume.NodeResizeOptions{
VolumeSpec: spec, VolumeSpec: spec,
NewSize: newSize, NewSize: newSize,
DeviceMountPath: "/foo/bar", DeviceMountPath: "/foo/bar",
CSIVolumePhase: tc.volumePhase, CSIVolumePhase: tc.volumePhase,
}
csiSource, _ := getCSISourceFromSpec(resizeOptions.VolumeSpec)
csClient := setupClientWithExpansion(t, tc.nodeStageSet, tc.nodeExpansion)
ok, err := plug.nodeExpandWithClient(resizeOptions, csiSource, csClient)
if ok != tc.success {
if err != nil {
t.Errorf("For %s : expected %v got %v with %v", tc.name, tc.success, ok, err)
} else {
t.Errorf("For %s : expected %v got %v", tc.name, tc.success, ok)
} }
csiSource, _ := getCSISourceFromSpec(resizeOptions.VolumeSpec)
} csClient := setupClientWithExpansion(t, tc.nodeStageSet, tc.nodeExpansion)
ok, err := plug.nodeExpandWithClient(resizeOptions, csiSource, csClient)
if ok != tc.success {
if err != nil {
t.Errorf("For %s : expected %v got %v with %v", tc.name, tc.success, ok, err)
} else {
t.Errorf("For %s : expected %v got %v", tc.name, tc.success, ok)
}
}
})
} }
} }