Mock is_windows = False

This commit is contained in:
twangboy 2018-10-29 10:25:56 -06:00
parent 1e8b092256
commit fd369dd115
No known key found for this signature in database
GPG key ID: 93FF3BDEB278C9EB

View file

@ -74,9 +74,11 @@ class DiskUsageBeaconTestCase(TestCase, LoaderModuleMockMixin):
def test_diskusage_match(self):
disk_usage_mock = Mock(side_effect=STUB_DISK_USAGE)
with patch('psutil.disk_partitions',
MagicMock(return_value=STUB_DISK_PARTITION)), \
patch('psutil.disk_usage', disk_usage_mock):
with patch('salt.utils.platform.is_windows',
MagicMock(return_value=False)),\
patch('psutil.disk_partitions',
MagicMock(return_value=STUB_DISK_PARTITION)), \
patch('psutil.disk_usage', disk_usage_mock):
config = [{'/': '50%'}]
ret = diskusage.validate(config)
@ -88,8 +90,10 @@ class DiskUsageBeaconTestCase(TestCase, LoaderModuleMockMixin):
def test_diskusage_nomatch(self):
disk_usage_mock = Mock(side_effect=STUB_DISK_USAGE)
with patch('psutil.disk_partitions',
MagicMock(return_value=STUB_DISK_PARTITION)), \
with patch('salt.utils.platform.is_windows',
MagicMock(return_value=False)),\
patch('psutil.disk_partitions',
MagicMock(return_value=STUB_DISK_PARTITION)), \
patch('psutil.disk_usage', disk_usage_mock):
config = [{'/': '70%'}]
@ -102,8 +106,10 @@ class DiskUsageBeaconTestCase(TestCase, LoaderModuleMockMixin):
def test_diskusage_match_regex(self):
disk_usage_mock = Mock(side_effect=STUB_DISK_USAGE)
with patch('psutil.disk_partitions',
MagicMock(return_value=STUB_DISK_PARTITION)), \
with patch('salt.utils.platform.is_windows',
MagicMock(return_value=False)),\
patch('psutil.disk_partitions',
MagicMock(return_value=STUB_DISK_PARTITION)), \
patch('psutil.disk_usage', disk_usage_mock):
config = [{r'^\/': '50%'}]