Merge pull request #43763 from twangboy/win_fix_test_disk

Fix `unit.modules.test_disk` for Windows
This commit is contained in:
Nicole Thomas 2017-09-27 10:32:41 -04:00 committed by GitHub
commit a48afa7175

View file

@ -152,6 +152,8 @@ class DiskTestCase(TestCase, LoaderModuleMockMixin):
with patch.dict(disk.__salt__, {'cmd.retcode': mock}):
self.assertEqual(disk.format_(device), True)
@skipIf(not salt.utils.which('lsblk') and not salt.utils.which('df'),
'lsblk or df not found')
def test_fstype(self):
'''
unit tests for disk.fstype