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

fix conditional LDAP test fail

Browse Source 
Previously, if the main unit tests, test_common.py was
run before running this test, it would fail.
By clearing the cache at the start of the test, we
make its behavior consistent and predictable no
matter what other tests are also being ran,
and the assertion is adjusted to match.
This commit is contained in:
AlanCoding
2018-04-16 07:53:39 -04:00
parent b1f4fb3a98
commit 8ea323895a
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
} }