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 ipset unit tests based on changes. Adding additional tests for when ip set type is hash:net

Browse source
This commit is contained in:
Gareth J. Greenaway 2015-08-27 08:28:23 -07:00
parent 0a499bd0fa
commit c11cf22abe
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
tests/unit/modules/ipset_test.py
View file

@ -185,13 +185,13 @@ comment support')
self.assertEqual(ipset.check('set', 'entry'),
'Error: Set set does not exist')
with patch.object(ipset, '_find_set_type', return_value=True):
with patch.object(ipset, '_find_set_type', return_value='hash:ip'):
with patch.object(ipset, '_find_set_members',
side_effect=['entry', '',
["192.168.0.4", "192.168.0.5"],
["192.168.0.3"], ["192.168.0.6"],
["192.168.0.4", "192.168.0.5"],
["192.168.0.3"], ["192.168.0.6"],
['192.168.0.4', '192.168.0.5'],
['192.168.0.3'], ['192.168.0.6'],
['192.168.0.4', '192.168.0.5'],
['192.168.0.3'], ['192.168.0.6'],
]):
self.assertTrue(ipset.check('set', 'entry'))
self.assertFalse(ipset.check('set', 'entry'))
@ -202,6 +202,19 @@ comment support')
self.assertFalse(ipset.check('set', '192.168.0.4-192.168.0.5'))
self.assertFalse(ipset.check('set', '192.168.0.4-192.168.0.5'))
with patch.object(ipset, '_find_set_type', return_value='hash:net'):
with patch.object(ipset, '_find_set_members',
side_effect=['entry', '',
'192.168.0.4/31', '192.168.0.4/30',
'192.168.0.4/31', '192.168.0.4/30',
]):
self.assertTrue(ipset.check('set', 'entry'))
self.assertFalse(ipset.check('set', 'entry'))
self.assertTrue(ipset.check('set', '192.168.0.4/31'))
self.assertFalse(ipset.check('set', '192.168.0.4/31'))
self.assertTrue(ipset.check('set', '192.168.0.4-192.168.0.5'))
self.assertFalse(ipset.check('set', '192.168.0.4-192.168.0.5'))
def test_test(self):
'''
Test for Test if an entry is in the specified set.