Ub-1060: fix tests

IBM · Sep 3, 2018 · 55e88ae · 55e88ae
1 parent f6d6bae
commit 55e88ae
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/remote/mounter/block_device_mounter_utils/block_device_mounter_utils.go b/remote/mounter/block_device_mounter_utils/block_device_mounter_utils.go
@@ -121,7 +121,7 @@ func (b *blockDeviceMounterUtils) UnmountDeviceFlow(devicePath string, volumeWwn
 		return b.logger.ErrorRet(err, "Dmsetup failed")
 	}
 
-	err := b.blockDeviceUtils.UmountFs(devicePath, volumeWwn)
+	err = b.blockDeviceUtils.UmountFs(devicePath, volumeWwn)
 	if err != nil {
 		return b.logger.ErrorRet(err, "UmountFs failed")
 	}

diff --git a/remote/mounter/block_device_mounter_utils/block_device_utils_mounter_test.go b/remote/mounter/block_device_mounter_utils/block_device_utils_mounter_test.go
@@ -284,7 +284,7 @@ var _ = Describe("block_device_mounter_utils_test", func() {
 		FIt("should fail if dmsetup failed", func() {
 			fakeBlockDeviceUtils.SetDmsetupReturns(callErr)
 			fakeBlockDeviceUtils.UmountFsReturns(nil)
-			err = blockDeviceMounterUtils.UnmountDeviceFlow("fake_device")
+			err = blockDeviceMounterUtils.UnmountDeviceFlow("fake_device", "6001738CFC9035EA0000000000795164")
 			Expect(err).To(HaveOccurred())
 			Expect(err).To(MatchError(callErr))
 			Expect(fakeBlockDeviceUtils.SetDmsetupCallCount()).To(Equal(1))

diff --git a/remote/mounter/block_device_utils/mpath.go b/remote/mounter/block_device_utils/mpath.go
@@ -276,7 +276,7 @@ func (b *blockDeviceUtils) Cleanup(mpath string) error {
 	if err := b.exec.IsExecutable(multipathCmd); err != nil {
 		return b.logger.ErrorRet(&commandNotFoundError{multipathCmd, err}, "failed")
 	}
-	args = []string{"-f", dev}
+	args := []string{"-f", dev}
 	if _, err := b.exec.ExecuteWithTimeout(CleanupTimeout, multipathCmd, args); err != nil {
 		return b.logger.ErrorRet(&CommandExecuteError{multipathCmd, err}, "failed")
 	}