fixes saltstack#64420 'unable to unmount' failure should return False…

… result
nicholasmhughes · Jun 4, 2023 · 0e3781e · 0e3781e
1 parent 41d9f33
commit 0e3781e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/changelog/64420.fixed.md b/changelog/64420.fixed.md
@@ -0,0 +1 @@
+Fix 'unable to unmount' failure to return False result instead of None
diff --git a/salt/states/mount.py b/salt/states/mount.py
@@ -626,7 +626,7 @@ def mounted(
                     active = __salt__["mount.active"](extended=True)
                     if comp_real_name in active:
                         ret["comment"] = "Unable to unmount"
-                        ret["result"] = None
+                        ret["result"] = False
                         return ret
                     update_mount_cache = True
             else:

diff --git a/tests/pytests/unit/states/test_mount.py b/tests/pytests/unit/states/test_mount.py
@@ -94,7 +94,7 @@ def test_mounted():
                 ret.update(
                     {
                         "comment": comt,
-                        "result": None,
+                        "result": False,
                         "changes": {"umount": umount1},
                     }
                 )
@@ -115,7 +115,7 @@ def test_mounted():
                     "os.path.exists", MagicMock(return_value=False)
                 ):
                     comt = "{} does not exist and would not be created".format(name)
-                    ret.update({"comment": comt, "changes": {}})
+                    ret.update({"comment": comt, "changes": {}, "result": None})
                     assert mount.mounted(name, device, fstype) == ret
 
                 with patch.dict(mount.__opts__, {"test": False}):