External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-19 01:47:31 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1378 from AlanCoding/fix_unit_test

Browse Source 
Fix conditional LDAP test fail
This commit is contained in:
Alan Rominger
2018-04-16 09:13:59 -04:00
committed by GitHub
parent 900ea14883 8ea323895a
commit 8a55b7f296
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/sso/tests/unit/test_ldap.py
View File

@@ -2,6 +2,7 @@ import ldap
from awx.sso.backends import LDAPSettings from awx.sso.backends import LDAPSettings
from awx.sso.validators import validate_ldap_filter from awx.sso.validators import validate_ldap_filter
from django.core.cache import cache
def test_ldap_default_settings(mocker): def test_ldap_default_settings(mocker):
@@ -13,11 +14,11 @@ def test_ldap_default_settings(mocker):
def test_ldap_default_network_timeout(mocker): def test_ldap_default_network_timeout(mocker):
cache.clear() # clearing cache avoids picking up stray default for OPT_REFERRALS
from_db = mocker.Mock(**{'order_by.return_value': []}) from_db = mocker.Mock(**{'order_by.return_value': []})
with mocker.patch('awx.conf.models.Setting.objects.filter', return_value=from_db): with mocker.patch('awx.conf.models.Setting.objects.filter', return_value=from_db):
settings = LDAPSettings() settings = LDAPSettings()
assert settings.CONNECTION_OPTIONS == { assert settings.CONNECTION_OPTIONS == {
ldap.OPT_REFERRALS: 0,
ldap.OPT_NETWORK_TIMEOUT: 30 ldap.OPT_NETWORK_TIMEOUT: 30
} }