Merge pull request #54536 from garethgreenaway/2019_2_1_port_52589

[master] Porting #52589 to master
saltstack · Nov 7, 2019 · 920529e · 920529e
2 parents 336c792 + b33484e
commit 920529e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/salt/states/blockdev.py b/salt/states/blockdev.py
@@ -193,5 +193,7 @@ def _checkblk(name):
     Check if the blk exists and return its fstype if ok
     '''
 
-    blk = __salt__['cmd.run']('blkid -o value -s TYPE {0}'.format(name))
+    blk = __salt__['cmd.run'](
+        ['blkid', '-o', 'value', '-s', 'TYPE', name],
+        ignore_retcode=True)
     return '' if not blk else blk
diff --git a/tests/unit/states/test_blockdev.py b/tests/unit/states/test_blockdev.py
@@ -12,6 +12,7 @@
 from tests.support.mock import (
     NO_MOCK,
     NO_MOCK_REASON,
+    Mock,
     MagicMock,
     patch)
 
@@ -107,3 +108,15 @@ def test_formatted(self):
                                   MagicMock(return_value=True)):
                     with patch.dict(blockdev.__opts__, {'test': False}):
                         self.assertDictEqual(blockdev.formatted(name), ret)
+
+    def test__checkblk(self):
+        '''
+        Confirm that we call cmd.run with ignore_retcode=True
+        '''
+        cmd_mock = Mock()
+        with patch.dict(blockdev.__salt__, {'cmd.run': cmd_mock}):
+            blockdev._checkblk('/dev/foo')
+
+        cmd_mock.assert_called_once_with(
+            ['blkid', '-o', 'value', '-s', 'TYPE', '/dev/foo'],
+            ignore_retcode=True)