From 134326baaf9f5b44f934af71d0c007586ad9e900 Mon Sep 17 00:00:00 2001 From: adaml Date: Wed, 9 Nov 2016 17:51:37 +0200 Subject: [PATCH] CFY-6085 fix active directory integrtation --- ldappy/ldapconnection.py | 2 +- tests/conftest.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ldappy/ldapconnection.py b/ldappy/ldapconnection.py index a82b0eb..f2e0eff 100644 --- a/ldappy/ldapconnection.py +++ b/ldappy/ldapconnection.py @@ -63,4 +63,4 @@ def disconnect(self): try: self._conn.unbind_s() except: - pass \ No newline at end of file + pass diff --git a/tests/conftest.py b/tests/conftest.py index 28dfdc9..9c28f95 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -8,7 +8,7 @@ def pytest_addoption(parser): def pytest_generate_tests(metafunc): - configs = {'ad_config': {'config': {'ldap_server': 'ldap://52.57.5.220:389/', + configs = {'ad_config': {'config': {'ldap_server': 'ldap://52.57.52.159:389/', 'active_directory': True, 'domain': 'cloudify.com', 'username': 'omer',