Skip to content

Commit 54da887

Browse files
committed
Fix glob patterns in tests
1 parent f6e67bb commit 54da887

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

pkg/internal/device_link_handler_test.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ func TestDeviceLinkHandler_UpdateStatusAndPV(t *testing.T) {
244244
ownerObj: newLocalVolume("lv-statustest", "default", "11111111-aaaa-bbbb-cccc-111111111111"),
245245
existing: newLVDL("local-pv-statustest", "default", "local-pv-statustest"),
246246
existingPV: newPV("local-pv-statustest"),
247-
globLinks: []string{"/tmp/wwn-0x1234", "/tmp/scsi-abcde"},
247+
globLinks: []string{"/dev/disk/by-id/wwn-preferred", "/dev/disk/by-id/scsi-abcde"},
248248
filesystemUUID: "550e8400-e29b-41d4-a716-446655440000",
249249
expectedLVDL: &v1.LocalVolumeDeviceLink{
250250
ObjectMeta: metav1.ObjectMeta{Name: "local-pv-statustest", Namespace: "default"},
@@ -253,7 +253,7 @@ func TestDeviceLinkHandler_UpdateStatusAndPV(t *testing.T) {
253253
CurrentLinkTarget: "/dev/disk/by-id/wwn-current",
254254
PreferredLinkTarget: "/dev/disk/by-id/wwn-preferred",
255255
FilesystemUUID: "550e8400-e29b-41d4-a716-446655440000",
256-
ValidLinkTargets: []string{"/tmp/wwn-0x1234", "/tmp/scsi-abcde"},
256+
ValidLinkTargets: []string{"/dev/disk/by-id/wwn-preferred", "/dev/disk/by-id/scsi-abcde"},
257257
},
258258
},
259259
},
@@ -286,14 +286,15 @@ func TestDeviceLinkHandler_UpdateStatusAndPV(t *testing.T) {
286286
ownerObj: newLocalVolume("lv-fullflow", "openshift-local-storage", "33333333-aaaa-bbbb-cccc-333333333333"),
287287
preCreate: true,
288288
existingPV: newPV("local-pv-fullflow"),
289+
globLinks: []string{"/dev/disk/by-id/wwn-preferred"},
289290
expectedLVDL: &v1.LocalVolumeDeviceLink{
290291
ObjectMeta: metav1.ObjectMeta{Name: "local-pv-fullflow", Namespace: "openshift-local-storage"},
291292
Spec: v1.LocalVolumeDeviceLinkSpec{PersistentVolumeName: "local-pv-fullflow"},
292293
Status: v1.LocalVolumeDeviceLinkStatus{
293294
CurrentLinkTarget: "/dev/disk/by-id/scsi-current",
294295
PreferredLinkTarget: "/dev/disk/by-id/wwn-preferred",
295296
FilesystemUUID: "",
296-
ValidLinkTargets: []string{},
297+
ValidLinkTargets: []string{"/dev/disk/by-id/wwn-preferred"},
297298
},
298299
},
299300
},

0 commit comments

Comments
 (0)