diff options
| author | Nikolai Kondrashov <Nikolai.Kondrashov@redhat.com> | 2015-09-29 20:00:14 +0300 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2015-10-02 09:26:22 +0200 |
| commit | e1e7797fc8ab8f02e3a759eed28ac60fe5e3c558 (patch) | |
| tree | 22511f69f8c1b7ef4b61a62c0018f2d198858c21 | |
| parent | e51143e3e67c70b86dd9a67cb7e802dd96f989e1 (diff) | |
| download | sssd-e1e7797fc8ab8f02e3a759eed28ac60fe5e3c558.tar.gz sssd-e1e7797fc8ab8f02e3a759eed28ac60fe5e3c558.tar.xz sssd-e1e7797fc8ab8f02e3a759eed28ac60fe5e3c558.zip | |
intg: Get base DN from LDAP connection object
Don't use the global LDAP_BASE_DN in integration tests and fixtures, but
instead take it from the LDAP connection object (ldap_conn) passed to
them explicitly. This makes the tests and fixtures a bit more modular.
| -rw-r--r-- | src/tests/intg/ldap_test.py | 8 | ||||
| -rw-r--r-- | src/tests/intg/test_memory_cache.py | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/tests/intg/ldap_test.py b/src/tests/intg/ldap_test.py index ea114dcb0..0287a2825 100644 --- a/src/tests/intg/ldap_test.py +++ b/src/tests/intg/ldap_test.py @@ -105,7 +105,7 @@ def create_sssd_fixture(request): @pytest.fixture def sanity_rfc2307(request, ldap_conn): - ent_list = ldap_ent.List(LDAP_BASE_DN) + ent_list = ldap_ent.List(ldap_conn.ds_inst.base_dn) ent_list.add_user("user1", 1001, 2001) ent_list.add_user("user2", 1002, 2002) ent_list.add_user("user3", 1003, 2003) @@ -150,7 +150,7 @@ def sanity_rfc2307(request, ldap_conn): @pytest.fixture def simple_rfc2307(request, ldap_conn): - ent_list = ldap_ent.List(LDAP_BASE_DN) + ent_list = ldap_ent.List(ldap_conn.ds_inst.base_dn) ent_list.add_user('usr\\\\001', 181818, 181818) ent_list.add_group("group1", 181818) @@ -181,7 +181,7 @@ def simple_rfc2307(request, ldap_conn): @pytest.fixture def sanity_rfc2307_bis(request, ldap_conn): - ent_list = ldap_ent.List(LDAP_BASE_DN) + ent_list = ldap_ent.List(ldap_conn.ds_inst.base_dn) ent_list.add_user("user1", 1001, 2001) ent_list.add_user("user2", 1002, 2002) ent_list.add_user("user3", 1003, 2003) @@ -309,7 +309,7 @@ def test_sanity_rfc2307_bis(ldap_conn, sanity_rfc2307_bis): @pytest.fixture def refresh_after_cleanup_task(request, ldap_conn): - ent_list = ldap_ent.List(LDAP_BASE_DN) + ent_list = ldap_ent.List(ldap_conn.ds_inst.base_dn) ent_list.add_user("user1", 1001, 2001) ent_list.add_group_bis("group1", 2001, ["user1"]) diff --git a/src/tests/intg/test_memory_cache.py b/src/tests/intg/test_memory_cache.py index 1f4ccb0f9..76d85fdc0 100644 --- a/src/tests/intg/test_memory_cache.py +++ b/src/tests/intg/test_memory_cache.py @@ -109,7 +109,7 @@ def create_sssd_fixture(request): def load_data_to_ldap(request, ldap_conn): - ent_list = ldap_ent.List(LDAP_BASE_DN) + ent_list = ldap_ent.List(ldap_conn.ds_inst.base_dn) ent_list.add_user("user1", 1001, 2001) ent_list.add_user("user2", 1002, 2002) ent_list.add_user("user3", 1003, 2003) |