From 193f43335fc5e336b46bc8d0e592f7a2a4496fc3 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Wed, 3 Aug 2016 09:45:33 +0200 Subject: [PATCH 5/8] intg: Fix pep8 warnings E302 expected 2 blank lines, found 1 E303 too many blank lines (2) E501 line too long (84 > 79 characters) --- src/tests/intg/ldap_local_override_test.py | 4 ++-- src/tests/intg/sssd_ldb.py | 3 ++- src/tests/intg/test_ts_cache.py | 33 ++++++++++++++++++++---------- 3 files changed, 26 insertions(+), 14 deletions(-) diff --git a/src/tests/intg/ldap_local_override_test.py b/src/tests/intg/ldap_local_override_test.py index a27b819b6bca7f5f1411826a496fc6aee924bfc0..63de836d4d645b2e2be968bb23ce84f0cb90189a 100644 --- a/src/tests/intg/ldap_local_override_test.py +++ b/src/tests/intg/ldap_local_override_test.py @@ -954,8 +954,8 @@ def test_regr_2790_override(ldap_conn, env_regr_2790_override): "Could not find groups for user2 %d" % errno assert sorted(grp_list) == sorted(["20002", "group1", "group2"]) + # Test fully qualified and case-insensitive names - @pytest.fixture def env_mix_cased_name_override(request, ldap_conn): """Setup test for mixed case names""" @@ -969,7 +969,6 @@ def env_mix_cased_name_override(request, ldap_conn): create_ldap_fixture(request, ldap_conn, ent_list) - pwd.getpwnam('user1@LDAP') pwd.getpwnam('user2@LDAP') with pytest.raises(KeyError): @@ -996,6 +995,7 @@ def env_mix_cased_name_override(request, ldap_conn): restart_sssd() + def test_mix_cased_name_override(ldap_conn, env_mix_cased_name_override): """Test if names with upper and lower case letter are overridden""" diff --git a/src/tests/intg/sssd_ldb.py b/src/tests/intg/sssd_ldb.py index b77d0eb088c1d3ea99935a6c6a9d964fec441c43..35b389da490ff8e76ae58dc303b809eb75d2aaf8 100644 --- a/src/tests/intg/sssd_ldb.py +++ b/src/tests/intg/sssd_ldb.py @@ -71,7 +71,8 @@ class SssdLdb(object): return "cn=%s,cn=%s,cn=sysdb" % (rdn, self._domain_name) def _basedn(self, name, domain, entry_type): - return "name=%s@%s,%s" % (name, domain.lower(), self._entry_basedn(entry_type)) + return "name=%s@%s,%s" % (name, domain.lower(), + self._entry_basedn(entry_type)) def get_entry_attr(self, cache_type, entry_type, name, domain, attr): dbconn = self._get_dbconn(cache_type) diff --git a/src/tests/intg/test_ts_cache.py b/src/tests/intg/test_ts_cache.py index 0ba84b45f57ca246d28bfa0478a2c0db7e7a99e0..c49a5c9c4e746ea935b924863b4b6308862f1404 100644 --- a/src/tests/intg/test_ts_cache.py +++ b/src/tests/intg/test_ts_cache.py @@ -259,8 +259,9 @@ def prime_cache_group(ldb_conn, name, members): def prime_cache_user(ldb_conn, name, primary_gid): - # calling initgroups would add the initgExpire timestamp attribute and make sure - # that sss_cache doesn't add it with a value of 1, triggering a sysdb update + # calling initgroups would add the initgExpire timestamp attribute and + # make sure that sss_cache doesn't add it with a value of 1, + # triggering a sysdb update (res, errno, gids) = sssd_id.call_sssd_initgroups(name, primary_gid) assert res == sssd_id.NssReturnCode.SUCCESS @@ -295,7 +296,8 @@ def test_group_2307bis_update_same_modstamp(ldap_conn, SSSD_DOMAIN, TS_ATTRLIST) assert_same_attrval(sysdb_attrs, old_sysdb_attrs, "dataExpireTimestamp") - assert_same_attrval(sysdb_attrs, old_sysdb_attrs, "originalModifyTimestamp") + assert_same_attrval(sysdb_attrs, old_sysdb_attrs, + "originalModifyTimestamp") assert_diff_attrval(ts_attrs, old_ts_attrs, "dataExpireTimestamp") assert_same_attrval(ts_attrs, old_ts_attrs, "originalModifyTimestamp") @@ -328,7 +330,8 @@ def test_group_2307bis_update_same_attrs(ldap_conn, SSSD_DOMAIN, TS_ATTRLIST) assert_same_attrval(sysdb_attrs, old_sysdb_attrs, "dataExpireTimestamp") - assert_same_attrval(sysdb_attrs, old_sysdb_attrs, "originalModifyTimestamp") + assert_same_attrval(sysdb_attrs, old_sysdb_attrs, + "originalModifyTimestamp") assert_diff_attrval(ts_attrs, old_ts_attrs, "dataExpireTimestamp") assert_diff_attrval(ts_attrs, old_ts_attrs, "originalModifyTimestamp") @@ -358,7 +361,8 @@ def test_group_2307bis_update_diff_attrs(ldap_conn, SSSD_DOMAIN, TS_ATTRLIST) assert_diff_attrval(sysdb_attrs, old_sysdb_attrs, "dataExpireTimestamp") - assert_diff_attrval(sysdb_attrs, old_sysdb_attrs, "originalModifyTimestamp") + assert_diff_attrval(sysdb_attrs, old_sysdb_attrs, + "originalModifyTimestamp") assert_diff_attrval(ts_attrs, old_ts_attrs, "dataExpireTimestamp") assert_diff_attrval(ts_attrs, old_ts_attrs, "originalModifyTimestamp") @@ -410,7 +414,8 @@ def test_group_2307_update_same_modstamp(ldap_conn, SSSD_DOMAIN, TS_ATTRLIST) assert_same_attrval(sysdb_attrs, old_sysdb_attrs, "dataExpireTimestamp") - assert_same_attrval(sysdb_attrs, old_sysdb_attrs, "originalModifyTimestamp") + assert_same_attrval(sysdb_attrs, old_sysdb_attrs, + "originalModifyTimestamp") assert_diff_attrval(ts_attrs, old_ts_attrs, "dataExpireTimestamp") assert_same_attrval(ts_attrs, old_ts_attrs, "originalModifyTimestamp") @@ -443,7 +448,8 @@ def test_group_2307_update_same_attrs(ldap_conn, SSSD_DOMAIN, TS_ATTRLIST) assert_same_attrval(sysdb_attrs, old_sysdb_attrs, "dataExpireTimestamp") - assert_same_attrval(sysdb_attrs, old_sysdb_attrs, "originalModifyTimestamp") + assert_same_attrval(sysdb_attrs, old_sysdb_attrs, + "originalModifyTimestamp") assert_diff_attrval(ts_attrs, old_ts_attrs, "dataExpireTimestamp") assert_diff_attrval(ts_attrs, old_ts_attrs, "originalModifyTimestamp") @@ -472,7 +478,8 @@ def test_group_2307_update_diff_attrs(ldap_conn, SSSD_DOMAIN, TS_ATTRLIST) assert_diff_attrval(sysdb_attrs, old_sysdb_attrs, "dataExpireTimestamp") - assert_diff_attrval(sysdb_attrs, old_sysdb_attrs, "originalModifyTimestamp") + assert_diff_attrval(sysdb_attrs, old_sysdb_attrs, + "originalModifyTimestamp") assert_diff_attrval(ts_attrs, old_ts_attrs, "dataExpireTimestamp") assert_diff_attrval(ts_attrs, old_ts_attrs, "originalModifyTimestamp") @@ -520,7 +527,8 @@ def test_user_update_same_modstamp(ldap_conn, sysdb_attrs, ts_attrs = get_user_attrs(ldb_conn, "user1", SSSD_DOMAIN, TS_ATTRLIST) assert_same_attrval(sysdb_attrs, old_sysdb_attrs, "dataExpireTimestamp") - assert_same_attrval(sysdb_attrs, old_sysdb_attrs, "originalModifyTimestamp") + assert_same_attrval(sysdb_attrs, old_sysdb_attrs, + "originalModifyTimestamp") assert_diff_attrval(ts_attrs, old_ts_attrs, "dataExpireTimestamp") assert_same_attrval(ts_attrs, old_ts_attrs, "originalModifyTimestamp") @@ -549,7 +557,8 @@ def test_user_update_same_attrs(ldap_conn, sysdb_attrs, ts_attrs = get_user_attrs(ldb_conn, "user1", SSSD_DOMAIN, TS_ATTRLIST) assert_same_attrval(sysdb_attrs, old_sysdb_attrs, "dataExpireTimestamp") - assert_same_attrval(sysdb_attrs, old_sysdb_attrs, "originalModifyTimestamp") + assert_same_attrval(sysdb_attrs, old_sysdb_attrs, + "originalModifyTimestamp") assert_diff_attrval(ts_attrs, old_ts_attrs, "dataExpireTimestamp") assert_diff_attrval(ts_attrs, old_ts_attrs, "originalModifyTimestamp") @@ -577,11 +586,13 @@ def test_user_update_diff_attrs(ldap_conn, sysdb_attrs, ts_attrs = get_user_attrs(ldb_conn, "user1", SSSD_DOMAIN, TS_ATTRLIST) assert_diff_attrval(sysdb_attrs, old_sysdb_attrs, "dataExpireTimestamp") - assert_diff_attrval(sysdb_attrs, old_sysdb_attrs, "originalModifyTimestamp") + assert_diff_attrval(sysdb_attrs, old_sysdb_attrs, + "originalModifyTimestamp") assert_diff_attrval(ts_attrs, old_ts_attrs, "dataExpireTimestamp") assert_diff_attrval(ts_attrs, old_ts_attrs, "originalModifyTimestamp") + def test_user_2307bis_delete_user(ldap_conn, ldb_examine, setup_rfc2307bis): -- 2.9.2