From f79120bff36fe383abb9df4ecaef30d157a254cc Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Thu, 18 Aug 2016 12:06:45 +0200 Subject: [PATCH] test_netgroup_fixes --- src/tests/intg/test_netgroup.py | 37 +++++++++++++------------------------ 1 file changed, 13 insertions(+), 24 deletions(-) diff --git a/src/tests/intg/test_netgroup.py b/src/tests/intg/test_netgroup.py index 4be2b1c7048f3d8dc4797557d6decf1367eea36d..b3c272e8f305de9ca9d59bb4ce493178e2898756 100644 --- a/src/tests/intg/test_netgroup.py +++ b/src/tests/intg/test_netgroup.py @@ -200,7 +200,7 @@ def add_nested_netgroup(request, ldap_conn): ent_list.add_netgroup("nested_netgroup") create_ldap_fixture(request, ldap_conn, ent_list) - conf = format_basic_conf(ldap_conn, SCHEMA_RFC2307_BIS, enum=True) + conf = format_basic_conf(ldap_conn, SCHEMA_RFC2307_BIS, enum=False) create_conf_fixture(request, conf) create_sssd_fixture(request) return None @@ -224,7 +224,7 @@ def add_two_nested_netgroup(request, ldap_conn): ent_list.add_netgroup("nested_netgroup2") create_ldap_fixture(request, ldap_conn, ent_list) - conf = format_basic_conf(ldap_conn, SCHEMA_RFC2307_BIS, enum=True) + conf = format_basic_conf(ldap_conn, SCHEMA_RFC2307_BIS, enum=False) create_conf_fixture(request, conf) create_sssd_fixture(request) return None @@ -252,7 +252,7 @@ def add_tripled_netgroup(request, ldap_conn): ent_list.add_netgroup("tripled_netgroup", ["(host,user,domain)"]) create_ldap_fixture(request, ldap_conn, ent_list) - conf = format_basic_conf(ldap_conn, SCHEMA_RFC2307_BIS, enum=True) + conf = format_basic_conf(ldap_conn, SCHEMA_RFC2307_BIS, enum=False) create_conf_fixture(request, conf) create_sssd_fixture(request) return None @@ -276,7 +276,7 @@ def add_advanced_tripled_netgroup(request, ldap_conn): "(host2,user2,domain2)"]) create_ldap_fixture(request, ldap_conn, ent_list) - conf = format_basic_conf(ldap_conn, SCHEMA_RFC2307_BIS, enum=True) + conf = format_basic_conf(ldap_conn, SCHEMA_RFC2307_BIS, enum=False) create_conf_fixture(request, conf) create_sssd_fixture(request) return None @@ -301,7 +301,7 @@ def add_two_tripled_netgroup(request, ldap_conn): ent_list.add_netgroup("tripled_netgroup2", ["(host2,user2,domain2)"]) create_ldap_fixture(request, ldap_conn, ent_list) - conf = format_basic_conf(ldap_conn, SCHEMA_RFC2307_BIS, enum=True) + conf = format_basic_conf(ldap_conn, SCHEMA_RFC2307_BIS, enum=False) create_conf_fixture(request, conf) create_sssd_fixture(request) return None @@ -351,7 +351,7 @@ def add_mixed_netgroup(request, ldap_conn): create_ldap_fixture(request, ldap_conn, ent_list) - conf = format_basic_conf(ldap_conn, SCHEMA_RFC2307_BIS, enum=True) + conf = format_basic_conf(ldap_conn, SCHEMA_RFC2307_BIS, enum=False) create_conf_fixture(request, conf) create_sssd_fixture(request) return None @@ -415,7 +415,7 @@ def reproducer_t2841(request, ldap_conn): ["t2841_netgroup1", "t2841_netgroup2"]) create_ldap_fixture(request, ldap_conn, ent_list) - conf = format_basic_conf(ldap_conn, SCHEMA_RFC2307_BIS, enum=True) + conf = format_basic_conf(ldap_conn, SCHEMA_RFC2307_BIS, enum=False) create_conf_fixture(request, conf) create_sssd_fixture(request) return (ldap_conn, ent_list) @@ -439,8 +439,8 @@ def test_reproducer_t2841(reproducer_t2841): res, errno, netgroups = sssd_netgroup.get_sssd_netgroups("t2841_netgroup3") assert res == sssd_netgroup.NssReturnCode.SUCCESS - assert netgroups == [('host2', 'user2', 'domain2'), - ('host1', 'user1', 'domain1')] + assert sorted(netgroups) == sorted([('host1', 'user1', 'domain1'), + ('host2', 'user2', 'domain2')]) # removing of t2841_netgroup1 ldap_conn.delete_s(ent_list[0][0]) @@ -450,19 +450,14 @@ def test_reproducer_t2841(reproducer_t2841): res, errno, netgroups = sssd_netgroup.get_sssd_netgroups("t2841_netgroup1") assert res == sssd_netgroup.NssReturnCode.NOTFOUND - assert netgroups == [] res, errno, netgroups = sssd_netgroup.get_sssd_netgroups("t2841_netgroup2") assert res == sssd_netgroup.NssReturnCode.SUCCESS assert netgroups == [('host2', 'user2', 'domain2')] - # FIX: This should be SUCCES res, errno, netgroups = sssd_netgroup.get_sssd_netgroups("t2841_netgroup3") - assert res == sssd_netgroup.NssReturnCode.NOTFOUND - assert netgroups == [] - - # point A - # run_shell() + assert res == sssd_netgroup.NssReturnCode.SUCCESS + assert netgroups == [('host2', 'user2', 'domain2')] # removing of t2841_netgroup2 ldap_conn.delete_s(ent_list[0][0]) @@ -472,16 +467,10 @@ def test_reproducer_t2841(reproducer_t2841): res, errno, netgroups = sssd_netgroup.get_sssd_netgroups("t2841_netgroup1") assert res == sssd_netgroup.NssReturnCode.NOTFOUND - assert netgroups == [] res, errno, netgroups = sssd_netgroup.get_sssd_netgroups("t2841_netgroup2") assert res == sssd_netgroup.NssReturnCode.NOTFOUND - assert netgroups == [] - # FIX: This should be SUCCES res, errno, netgroups = sssd_netgroup.get_sssd_netgroups("t2841_netgroup3") - assert res == sssd_netgroup.NssReturnCode.NOTFOUND - assert netgroups == [] - - # point B - # run_shell() \ No newline at end of file + assert res == sssd_netgroup.NssReturnCode.SUCCESS + assert netgroups == [] -- 2.9.3