saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixing test_diskusage_nomatch and test_diskusage_match_regex

Browse source
This commit is contained in:
Gareth J. Greenaway 2018-07-23 11:01:36 -07:00
parent 6ecca166ff
commit 38a65e8fb3
No known key found for this signature in database
GPG key ID: 10B62F8A7CAD7A41
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tests/unit/beacons/test_diskusage_beacon.py
View file

@ -68,10 +68,10 @@ class DiskUsageBeaconTestCase(TestCase, LoaderModuleMockMixin):
self.assertEqual(ret, [{'diskusage': 50, 'mount': '/'}])
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)), \
patch('psutil.disk_usage',
MagicMock(return_value=STUB_DISK_USAGE)):
patch('psutil.disk_usage', disk_usage_mock):
config = [{'/': '70%'}]
ret = diskusage.validate(config)
@ -82,10 +82,10 @@ class DiskUsageBeaconTestCase(TestCase, LoaderModuleMockMixin):
self.assertNotEqual(ret, [{'diskusage': 50, 'mount': '/'}])
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)), \
patch('psutil.disk_usage',
MagicMock(return_value=STUB_DISK_USAGE)):
patch('psutil.disk_usage', disk_usage_mock):
config = [{r'^\/': '50%'}]
ret = diskusage.validate(config)