github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Fix unit tests

Browse Source
This commit is contained in:
Jan Safranek 2020-02-13 11:26:54 +01:00
parent e2d8e575f0
commit 0bd2e629c7
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/volume/csi/csi_block.go
View File

@ -466,7 +466,7 @@ func (m *csiBlockMapper) cleanupOrphanDeviceFiles() error {
publishDir = publishPath publishDir = publishPath
} }
if err := os.Remove(publishDir); err != nil && !os.IsNotExist(err) { if err := os.Remove(publishDir); err != nil && !os.IsNotExist(err) {
return errors.New(log("failed to publish directory [%s]: %v", publishDir, err)) return errors.New(log("failed to remove publish directory [%s]: %v", publishDir, err))
} }
// Remove artifacts of NodeStage. // Remove artifacts of NodeStage.

13
pkg/volume/csi/csi_block_test.go
View File

@ -304,7 +304,7 @@ func TestBlockMapperSetupDeviceError(t *testing.T) {
attachID := getAttachmentName(csiMapper.volumeID, string(csiMapper.driverName), string(nodeName)) attachID := getAttachmentName(csiMapper.volumeID, string(csiMapper.driverName), string(nodeName))
attachment := makeTestAttachment(attachID, nodeName, pvName) attachment := makeTestAttachment(attachID, nodeName, pvName)
attachment.Status.Attached = true attachment.Status.Attached = true
_, err = csiMapper.k8s.StorageV1().VolumeAttachments().Create(context.TODO(), attachment, metav1.CreateOptions{}) _, err = csiMapper.k8s.StorageV1().VolumeAttachments().Create(context.Background(), attachment, metav1.CreateOptions{})
if err != nil { if err != nil {
t.Fatalf("failed to setup VolumeAttachment: %v", err) t.Fatalf("failed to setup VolumeAttachment: %v", err)
} }
@ -347,10 +347,10 @@ func TestBlockMapperMapPodDevice(t *testing.T) {
csiMapper.csiClient = setupClient(t, true) csiMapper.csiClient = setupClient(t, true)
attachID := getAttachmentName(csiMapper.volumeID, string(csiMapper.driverName), string(nodeName)) attachID := getAttachmentName(csiMapper.volumeID, string(csiMapper.driverName), nodeName)
attachment := makeTestAttachment(attachID, nodeName, pvName) attachment := makeTestAttachment(attachID, nodeName, pvName)
attachment.Status.Attached = true attachment.Status.Attached = true
_, err = csiMapper.k8s.StorageV1().VolumeAttachments().Create(context.TODO(), attachment, metav1.CreateOptions{}) _, err = csiMapper.k8s.StorageV1().VolumeAttachments().Create(context.Background(), attachment, metav1.CreateOptions{})
if err != nil { if err != nil {
t.Fatalf("failed to setup VolumeAttachment: %v", err) t.Fatalf("failed to setup VolumeAttachment: %v", err)
} }
@ -483,6 +483,9 @@ func TestBlockMapperTearDownDevice(t *testing.T) {
func TestVolumeSetupTeardown(t *testing.T) { func TestVolumeSetupTeardown(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.CSIBlockVolume, true)() defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.CSIBlockVolume, true)()
// Follow volume setup + teardown sequences at top of cs_block.go and set up / clean up one CSI block device.
// Focus on testing that there were no leftover files present after the cleanup.
plug, tmpDir := newTestPlugin(t, nil) plug, tmpDir := newTestPlugin(t, nil)
defer os.RemoveAll(tmpDir) defer os.RemoveAll(tmpDir)
@ -505,7 +508,6 @@ func TestVolumeSetupTeardown(t *testing.T) {
} }
t.Log("created attachement ", attachID) t.Log("created attachement ", attachID)
// SetupDevice
err = csiMapper.SetUpDevice() err = csiMapper.SetUpDevice()
if err != nil { if err != nil {
t.Fatalf("mapper failed to SetupDevice: %v", err) t.Fatalf("mapper failed to SetupDevice: %v", err)
@ -521,7 +523,6 @@ func TestVolumeSetupTeardown(t *testing.T) {
t.Errorf("csi server expected device path %s, got %s", stagingPath, svol.Path) t.Errorf("csi server expected device path %s, got %s", stagingPath, svol.Path)
} }
// MapPodDevice
path, err := csiMapper.MapPodDevice() path, err := csiMapper.MapPodDevice()
if err != nil { if err != nil {
t.Fatalf("mapper failed to GetGlobalMapPath: %v", err) t.Fatalf("mapper failed to GetGlobalMapPath: %v", err)
@ -552,7 +553,6 @@ func TestVolumeSetupTeardown(t *testing.T) {
t.Fatalf("unmapper failed to GetGlobalMapPath: %v", err) t.Fatalf("unmapper failed to GetGlobalMapPath: %v", err)
} }
// UnmapDevice
err = csiUnmapper.UnmapPodDevice() err = csiUnmapper.UnmapPodDevice()
if err != nil { if err != nil {
t.Errorf("unmapper failed to call UnmapPodDevice: %v", err) t.Errorf("unmapper failed to call UnmapPodDevice: %v", err)
@ -566,7 +566,6 @@ func TestVolumeSetupTeardown(t *testing.T) {
csiUnmapper = unmapper.(*csiBlockMapper) csiUnmapper = unmapper.(*csiBlockMapper)
csiUnmapper.csiClient = csiMapper.csiClient csiUnmapper.csiClient = csiMapper.csiClient
// TearDownDevice
err = csiUnmapper.TearDownDevice(globalMapPath, "/dev/test") err = csiUnmapper.TearDownDevice(globalMapPath, "/dev/test")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)

2
pkg/volume/csi/fake/fake_client.go
View File

@ -192,9 +192,9 @@ func (f *NodeClient) NodePublishVolume(ctx context.Context, req *csipb.NodePubli
Path: req.GetTargetPath(), Path: req.GetTargetPath(),
DeviceMountPath: req.GetStagingTargetPath(), DeviceMountPath: req.GetStagingTargetPath(),
VolumeContext: req.GetVolumeContext(), VolumeContext: req.GetVolumeContext(),
FSType: req.GetVolumeCapability().GetMount().GetFsType(),
} }
if req.GetVolumeCapability().GetMount() != nil { if req.GetVolumeCapability().GetMount() != nil {
publishedVolume.FSType = req.GetVolumeCapability().GetMount().FsType
publishedVolume.MountFlags = req.GetVolumeCapability().GetMount().MountFlags publishedVolume.MountFlags = req.GetVolumeCapability().GetMount().MountFlags
} }
f.nodePublishedVolumes[req.GetVolumeId()] = publishedVolume f.nodePublishedVolumes[req.GetVolumeId()] = publishedVolume