On (08/10/15 20:43), Nikolai Kondrashov wrote:
Hi everyone,
Here are the integration test code improvement patches taken out of the
"intg: Add more LDAP tests" patch set to speed up merging.
These are supposed to have PEP8 errors/warnings fixed.
Nick
From a1bb94e87ef4c9e9e5ff39b8d2ee8682538a450c Mon Sep 17 00:00:00
2001
From: Nikolai Kondrashov <Nikolai.Kondrashov(a)redhat.com>
Date: Tue, 29 Sep 2015 20:00:14 +0300
Subject: [PATCH 1/5] 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.
---
ACK
From 5e84c37c6bd40660e7a7fc9e4a821b72b7906bf9 Mon Sep 17 00:00:00
2001
From: Nikolai Kondrashov <Nikolai.Kondrashov(a)redhat.com>
Date: Mon, 28 Sep 2015 16:12:48 +0300
Subject: [PATCH 2/5] intg: Add support for specifying all user attrs
Support passing all user attributes to ldap_ent.py's user-creation
functions, in integration tests.
---
src/tests/intg/ldap_ent.py | 51 +++++++++++++++++++++++++++++++++++-----------
1 file changed, 39 insertions(+), 12 deletions(-)
diff --git a/src/tests/intg/ldap_ent.py b/src/tests/intg/ldap_ent.py
index 30eed9d..4369869 100644
--- a/src/tests/intg/ldap_ent.py
+++ b/src/tests/intg/ldap_ent.py
ACK
From 498fb22bcbddd2d29435a7fba9e1d0ea9357dfbc Mon Sep 17 00:00:00
2001
From: Nikolai Kondrashov <Nikolai.Kondrashov(a)redhat.com>
Date: Tue, 29 Sep 2015 20:28:58 +0300
Subject: [PATCH 3/5] intg: Split LDAP test fixtures for flexibility
Split ldap_test.py fixtures into several functions to allow for partial
fixtures and direct use within tests.
---
src/tests/intg/ldap_test.py | 113 ++++++++++++++++++++++++++++++++------------
1 file changed, 83 insertions(+), 30 deletions(-)
diff --git a/src/tests/intg/ldap_test.py b/src/tests/intg/ldap_test.py
index 0287a28..1a72251 100644
--- a/src/tests/intg/ldap_test.py
+++ b/src/tests/intg/ldap_test.py
ACK
From 98a3584afcd111c9a30627067073e64000278e8e Mon Sep 17 00:00:00
2001
From: Nikolai Kondrashov <Nikolai.Kondrashov(a)redhat.com>
Date: Tue, 29 Sep 2015 20:46:06 +0300
Subject: [PATCH 4/5] intg: Reduce sssd.conf duplication in test_ldap.py
Use a function to generate basic sssd.conf in test_ldap.py to reduce
code duplication.
---
src/tests/intg/ldap_test.py | 140 ++++++++++++++------------------------------
1 file changed, 45 insertions(+), 95 deletions(-)
diff --git a/src/tests/intg/ldap_test.py b/src/tests/intg/ldap_test.py
index 1a72251..240ee56 100644
--- a/src/tests/intg/ldap_test.py
+++ b/src/tests/intg/ldap_test.py
ACK
From 39c13b67274f7f480dea2201ae8f1cb5fbb850ad Mon Sep 17 00:00:00
2001
From: Nikolai Kondrashov <Nikolai.Kondrashov(a)redhat.com>
Date: Wed, 30 Sep 2015 14:13:22 +0300
Subject: [PATCH 5/5] intg: Fix RFC2307bis group member creation
Fix creation of mixed user/group "member" attribute for RFC2307bis
group entries in ldap_ent.py.
---
src/tests/intg/ldap_ent.py | 21 +++++++--------------
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/src/tests/intg/ldap_ent.py b/src/tests/intg/ldap_ent.py
index 4369869..f8f2f7f 100644
--- a/src/tests/intg/ldap_ent.py
+++ b/src/tests/intg/ldap_ent.py
ACK