valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

move Bind to outside of functions

Browse Source
This commit is contained in:
Daniel Wallace 2018-02-07 15:55:20 -07:00
parent b0fb3d6786
commit 4d4a2f4790
No known key found for this signature in database
GPG Key ID: 5FA5E5544F010D48
1 changed files with 10 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
tests/unit/auth/test_ldap.py
View File

@ -11,6 +11,16 @@ import salt.auth.ldap
from tests.support.mock import MagicMock, patch, NO_MOCK, NO_MOCK_REASON from tests.support.mock import MagicMock, patch, NO_MOCK, NO_MOCK_REASON
from tests.support.unit import skipIf, TestCase from tests.support.unit import skipIf, TestCase
class Bind(object):
@classmethod
def search_s(*args, **kwargs):
return [
(
'cn=saltusers,cn=groups,cn=compat,dc=saltstack,dc=com',
{'memberUid': [b'saltuser'], 'cn': [b'saltusers']},
),
]
@skipIf(NO_MOCK, NO_MOCK_REASON) @skipIf(NO_MOCK, NO_MOCK_REASON)
@skipIf(not salt.auth.ldap.HAS_LDAP, 'Install python-ldap for this test') @skipIf(not salt.auth.ldap.HAS_LDAP, 'Install python-ldap for this test')
@ -42,41 +52,14 @@ class LDAPAuthTestCase(TestCase):
def test_groups_freeipa(self): def test_groups_freeipa(self):
salt.auth.ldap.__opts__['auth.ldap.freeipa'] = True salt.auth.ldap.__opts__['auth.ldap.freeipa'] = True
class Bind(object):
@classmethod
def search_s(*args, **kwargs):
return [
(
'cn=saltusers,cn=groups,cn=compat,dc=saltstack,dc=com',
{'memberUid': [b'saltuser'], 'cn': [b'saltusers']},
),
]
with patch('salt.auth.ldap.auth', return_value=Bind): with patch('salt.auth.ldap.auth', return_value=Bind):
self.assertIn('saltusers', salt.auth.ldap.groups('saltuser', password='password')) self.assertIn('saltusers', salt.auth.ldap.groups('saltuser', password='password'))
def test_groups(self): def test_groups(self):
class Bind(object):
@classmethod
def search_s(*args, **kwargs):
return [
(
'cn=saltusers,cn=users,cn=compat,dc=saltstack,dc=com',
{'memberUid': [b'saltuser'], 'cn': [b'saltusers']},
),
]
with patch('salt.auth.ldap.auth', return_value=Bind): with patch('salt.auth.ldap.auth', return_value=Bind):
self.assertIn('saltusers', salt.auth.ldap.groups('saltuser', password='password')) self.assertIn('saltusers', salt.auth.ldap.groups('saltuser', password='password'))
def test_groups_activedirectory(self): def test_groups_activedirectory(self):
salt.auth.ldap.__opts__['auth.ldap.activedirectory'] = True salt.auth.ldap.__opts__['auth.ldap.activedirectory'] = True
class Bind(object):
@classmethod
def search_s(*args, **kwargs):
return [
(
'cn=saltusers,cn=users,cn=compat,dc=saltstack,dc=com',
{'memberUid': [b'saltuser'], 'cn': [b'saltusers']},
),
]
with patch('salt.auth.ldap.auth', return_value=Bind): with patch('salt.auth.ldap.auth', return_value=Bind):
self.assertIn('saltusers', salt.auth.ldap.groups('saltuser', password='password')) self.assertIn('saltusers', salt.auth.ldap.groups('saltuser', password='password'))