Revert "Fix error message without var detail(per Dana review UB-1230)…

… and fix fake file"

This reverts commit 088cfb3.

remote/mounter/block_device_mounter_utils/block_device_utils_mounter_test.go

@@ -135,25 +135,25 @@ var _ = Describe("block_device_mounter_utils_test", func() {
 
 		})
 
-		It("should fail if IsDirAMountPoint failed", func() {
+		It("should fail if IsDirIsAMountPoint failed", func() {
 			fakeBlockDeviceUtils.CheckFsReturns(true, nil)
 			fakeBlockDeviceUtils.IsDeviceMountedReturns(false, nil, nil)
-			fakeBlockDeviceUtils.IsDirAMountPointReturns(false, nil, callErr)
+			fakeBlockDeviceUtils.IsDirIsAMountPointReturns(false, nil, callErr)
 			err = blockDeviceMounterUtils.MountDeviceFlow("fake_device", "fake_fstype", "fake_mountp")
 			Expect(err).To(HaveOccurred())
 			Expect(err).To(MatchError(callErr))
-			Expect(fakeBlockDeviceUtils.IsDirAMountPointCallCount()).To(Equal(1))
+			Expect(fakeBlockDeviceUtils.IsDirIsAMountPointCallCount()).To(Equal(1))
 		})
 
 		It("should fail to mount if mountpoint is already mounted to wrong device", func() {
 			fakeBlockDeviceUtils.CheckFsReturns(true, nil)
 			fakeBlockDeviceUtils.IsDeviceMountedReturns(false, nil, nil)
-			fakeBlockDeviceUtils.IsDirAMountPointReturns(true, []string{"/dev/mapper/mpathvfake1", "/dev/mapper/mpathvfake2"}, nil)
+			fakeBlockDeviceUtils.IsDirIsAMountPointReturns(true, nil, nil)
 			err = blockDeviceMounterUtils.MountDeviceFlow("fake_device", "fake_fstype", "fake_mountp")
 			Expect(err).To(HaveOccurred())
 			_, ok := err.(*block_device_mounter_utils.DirPathAlreadyMountedToWrongDevice)
 			Expect(ok).To(Equal(true))
-			Expect(fakeBlockDeviceUtils.IsDirAMountPointCallCount()).To(Equal(1))
+			Expect(fakeBlockDeviceUtils.IsDirIsAMountPointCallCount()).To(Equal(1))
 			Expect(fakeBlockDeviceUtils.MountFsCallCount()).To(Equal(0))
 
 		})
@@ -162,7 +162,7 @@ var _ = Describe("block_device_mounter_utils_test", func() {
 			fakeBlockDeviceUtils.CheckFsReturns(true, nil)
 			fakeBlockDeviceUtils.MakeFsReturns(nil)
 			fakeBlockDeviceUtils.MountFsReturns(callErr)
-			fakeBlockDeviceUtils.IsDirAMountPointReturns(false, nil, nil)
+			fakeBlockDeviceUtils.IsDirIsAMountPointReturns(false, nil, nil)
 
 			err = blockDeviceMounterUtils.MountDeviceFlow("fake_device", "fake_fstype", "fake_mountp")
 			Expect(err).To(HaveOccurred())
@@ -173,7 +173,7 @@ var _ = Describe("block_device_mounter_utils_test", func() {
 			fakeBlockDeviceUtils.CheckFsReturns(true, nil)
 			fakeBlockDeviceUtils.MakeFsReturns(nil)
 			fakeBlockDeviceUtils.MountFsReturns(nil)
-			fakeBlockDeviceUtils.IsDirAMountPointReturns(false, nil, nil)
+			fakeBlockDeviceUtils.IsDirIsAMountPointReturns(false, nil, nil)
 
 			err = blockDeviceMounterUtils.MountDeviceFlow("fake_device", "fake_fstype", "fake_mountp")
 			Expect(err).NotTo(HaveOccurred())

remote/mounter/block_device_mounter_utils/errors.go

@@ -34,6 +34,6 @@ type DirPathAlreadyMountedToWrongDevice struct {
 }
 
 func (e *DirPathAlreadyMountedToWrongDevice) Error() string {
-	return fmt.Sprintf("[%s] directory is already a mountpoint but to unexpected devices=%v (expected mountpoint only on device=[%s])",
+	return fmt.Sprintf("[%s] directory is already a mountpoint but to unexpected devices=%#v (expected mountpoint only on device=[%s])",
 		e.mountPoint, e.unexpectedDevicesRefs, e.expectedDevice)
 }