URL: https://github.com/SSSD/sssd/pull/5812
Author: sgoveas
Title: #5812: Tests: Modify ported AD tests marker to tier1_2 and fix a
restore error
Action: opened
PR body:
"""
Use tier1_2 marker for newly ported ad parameters tests to reduce runtime to 1
hour and fix and ldap.conf backup restore
"""
To pull the PR as Git branch:
git remote add ghsssd https://github.com/SSSD/sssd
git fetch ghsssd pull/5812/head:pr5812
git checkout pr5812
From bfbea33ccc8bc373662e13660bc732361dc69b3a Mon Sep 17 00:00:00 2001
From: Steeve Goveas <sgov...@redhat.com>
Date: Wed, 6 Oct 2021 13:20:26 +0530
Subject: [PATCH 1/2] Test: Update marker to tier1_2 for some ad tier1 tests
To reduce test runtime to around 1 hour
---
src/tests/multihost/ad/pytest.ini | 3 +-
.../multihost/ad/test_adparameters_ported.py | 43 +------------------
2 files changed, 3 insertions(+), 43 deletions(-)
diff --git a/src/tests/multihost/ad/pytest.ini b/src/tests/multihost/ad/pytest.ini
index bd4f102151..043f6c7f24 100644
--- a/src/tests/multihost/ad/pytest.ini
+++ b/src/tests/multihost/ad/pytest.ini
@@ -8,6 +8,7 @@ markers =
smbsecretrotation: Samba Secret database rotation
sudo: Test cases related to sudo using AD backend.
cifs: Cifs test cases
- tier1: All tier1 test cases
+ tier1: tier1 test cases with run time of aproximately 60 minutes
+ tier1_2: tier1 test cases split to keep runtime upto 60 minutes
tier2: All tier2 test cases
tier3: All tier3 test cases
diff --git a/src/tests/multihost/ad/test_adparameters_ported.py b/src/tests/multihost/ad/test_adparameters_ported.py
index 21a4739738..b84aa645cb 100644
--- a/src/tests/multihost/ad/test_adparameters_ported.py
+++ b/src/tests/multihost/ad/test_adparameters_ported.py
@@ -180,13 +180,13 @@ def set_ssh_key_ldap(session_multihost, user, pubkey, operation="replace"):
return cmd.returncode == 0
+@pytest.mark.tier1_2
@pytest.mark.adparameters
@pytest.mark.usefixtures("change_client_hostname")
class TestADParamsPorted:
""" BZ Automated Test Cases for AD Parameters ported from bash"""
@staticmethod
- @pytest.mark.tier1
def test_0001_ad_parameters_domain(
multihost, adjoin, create_aduser_group):
"""
@@ -260,7 +260,6 @@ def test_0001_ad_parameters_domain(
assert su_result, "The su command failed!"
@staticmethod
- @pytest.mark.tier1
def test_0002_ad_parameters_junk_domain(
multihost, adjoin, create_aduser_group):
"""
@@ -333,7 +332,6 @@ def test_0002_ad_parameters_junk_domain(
assert "segfault" not in log_msg_str, "Segfault present in the log!"
@staticmethod
- @pytest.mark.tier1
def test_0003_ad_parameters_junk_domain_invalid_keytab(
multihost, adjoin, create_aduser_group):
"""
@@ -450,7 +448,6 @@ def test_0003_ad_parameters_junk_domain_invalid_keytab(
assert "Option krb5_realm set to JUNK" in log_str
@staticmethod
- @pytest.mark.tier1
def test_0004_ad_parameters_valid_domain_shorthost(
multihost, adjoin, create_aduser_group):
"""
@@ -527,7 +524,6 @@ def test_0004_ad_parameters_valid_domain_shorthost(
assert su_result, "The su command failed!"
@staticmethod
- @pytest.mark.tier1
def test_0005_ad_parameters_blank_domain(
multihost, adjoin, create_aduser_group):
"""
@@ -607,7 +603,6 @@ def test_0005_ad_parameters_blank_domain(
assert su_result, "The su command failed!"
@staticmethod
- @pytest.mark.tier1
def test_0006_ad_parameters_homedir_override_nss(
multihost, adjoin, create_plain_aduser_group):
"""
@@ -657,7 +652,6 @@ def test_0006_ad_parameters_homedir_override_nss(
usr_cmd.stdout_text
@staticmethod
- @pytest.mark.tier1
def test_0007_ad_parameters_homedir_override_domain(
multihost, adjoin, create_plain_aduser_group):
"""
@@ -706,7 +700,6 @@ def test_0007_ad_parameters_homedir_override_domain(
usr_cmd.stdout_text
@staticmethod
- @pytest.mark.tier1
def test_0008_ad_parameters_homedir_override_both(
multihost, adjoin, create_plain_aduser_group):
"""
@@ -756,7 +749,6 @@ def test_0008_ad_parameters_homedir_override_both(
usr_cmd.stdout_text
@staticmethod
- @pytest.mark.tier1
@pytest.mark.skip(reason="The ldap sasl authid just does not work.")
def test_0009_ad_parameters_ldap_sasl_full(
multihost, adjoin, create_aduser_group, fetch_ca_cert):
@@ -859,7 +851,6 @@ def test_0009_ad_parameters_ldap_sasl_full(
assert su_result, f"Su for user {aduser} failed!"
@staticmethod
- @pytest.mark.tier1
@pytest.mark.skip(reason="The ldap sasl authid just does not work.")
def test_0010_ad_parameters_ldap_sasl_short(
multihost, adjoin, create_aduser_group):
@@ -947,7 +938,6 @@ def test_0010_ad_parameters_ldap_sasl_short(
assert su_result, f"Su for user {aduser} failed!"
@staticmethod
- @pytest.mark.tier1
def test_0011_ad_parameters_server_resolvable(
multihost, adjoin, create_aduser_group):
"""
@@ -1031,7 +1021,6 @@ def test_0011_ad_parameters_server_resolvable(
assert su_result, "The su command failed!"
@staticmethod
- @pytest.mark.tier1
def test_0012_ad_parameters_server_unresolvable(
multihost, adjoin, create_aduser_group):
"""
@@ -1089,7 +1078,6 @@ def test_0012_ad_parameters_server_unresolvable(
assert usr_cmd.returncode == 2, f"User {aduser} was found!"
@staticmethod
- @pytest.mark.tier1
def test_0013_ad_parameters_server_srv_record(
multihost, adjoin, create_aduser_group):
"""
@@ -1153,7 +1141,6 @@ def test_0013_ad_parameters_server_srv_record(
assert su_result, "The su command failed!"
@staticmethod
- @pytest.mark.tier1
def test_0014_ad_parameters_server_blank(
multihost, adjoin, create_aduser_group):
"""
@@ -1216,7 +1203,6 @@ def test_0014_ad_parameters_server_blank(
assert su_result, "The su command failed!"
@staticmethod
- @pytest.mark.tier1
def test_0015_ad_parameters_ad_hostname_machine(
multihost, adjoin, create_aduser_group):
"""
@@ -1298,7 +1284,6 @@ def test_0015_ad_parameters_ad_hostname_machine(
assert su_result, "The su command failed!"
@staticmethod
- @pytest.mark.tier1
def test_0016_ad_parameters_ad_hostname_valid(
multihost, adjoin, create_aduser_group):
"""
@@ -1391,7 +1376,6 @@ def test_0016_ad_parameters_ad_hostname_valid(
assert su_result, "The su command failed!"
@staticmethod
- @pytest.mark.tier1
def test_0017_ad_parameters_krb5_keytab_nonexistent(
multihost, adjoin, create_aduser_group):
"""
@@ -1478,7 +1462,6 @@ def test_0017_ad_parameters_krb5_keytab_nonexistent(
assert usr_cmd.returncode == 2, f"User {aduser} was found."
@staticmethod
- @pytest.mark.tier1
def test_0018_ad_parameters_krb5_keytab_elsewhere(
multihost, adjoin, create_aduser_group):
"""
@@ -1571,7 +1554,6 @@ def test_0018_ad_parameters_krb5_keytab_elsewhere(
assert su_result, "The su command failed!"
@staticmethod
- @pytest.mark.tier1
def test_0019_ad_parameters_ldap_id_mapping_false(
multihost, adjoin, create_aduser_group, create_plain_aduser_group
):
@@ -1671,7 +1653,6 @@ def test_0019_ad_parameters_ldap_id_mapping_false(
assert su_result, "The su command failed!"
@staticmethod
- @pytest.mark.tier1
def test_0020_ad_parameters_ssh_change_password(
multihost, adjoin, create_aduser_group
):
@@ -1735,7 +1716,6 @@ def test_0020_ad_parameters_ssh_change_password(
assert su_result, "The su command failed!"
@staticmethod
- @pytest.mark.tier1
def test_0021_ad_parameters_ssh_change_password_logon(
multihost, adjoin, create_aduser_group
):
@@ -1811,7 +1791,6 @@ def test_0021_ad_parameters_ssh_change_password_logon(
assert "system error" not in log_str
@staticmethod
- @pytest.mark.tier1
def test_0022_ad_parameters_account_disabled(
multihost, adjoin, create_aduser_group):
"""
@@ -1891,7 +1870,6 @@ def test_0022_ad_parameters_account_disabled(
assert "The user account is disabled on the AD server" in log_str
@staticmethod
- @pytest.mark.tier1
def test_0023_ad_parameters_account_expired(
multihost, adjoin, create_aduser_group):
"""
@@ -1969,7 +1947,6 @@ def test_0023_ad_parameters_account_expired(
assert f"{aduser}: 13 (User account has expired)" in log_str
@staticmethod
- @pytest.mark.tier1
def test_0024_ad_parameters_getgrgid_nested(
multihost, adjoin, create_plain_aduser_group):
"""
@@ -2055,7 +2032,6 @@ def test_0024_ad_parameters_getgrgid_nested(
assert test3_cmd.returncode == 0, "Gid of expected group missing."
@staticmethod
- @pytest.mark.tier1
def test_0025_ad_parameters_empty_group(multihost, adjoin):
"""
:title: IDM-SSSD-TC: ad_provider: ad_parameters: empty group cannot
@@ -2114,7 +2090,6 @@ def test_0025_ad_parameters_empty_group(multihost, adjoin):
assert getent_cmd.returncode == 0, "Group not found!"
@staticmethod
- @pytest.mark.tier1
def test_0026_ad_parameters_dns_failover(
multihost, adjoin, create_plain_aduser_group):
"""
@@ -2192,7 +2167,6 @@ def test_0026_ad_parameters_dns_failover(
assert getent_cmd.returncode == 0, "User not found."
@staticmethod
- @pytest.mark.tier1
def test_0027_ad_parameters_group_membership_empty(
multihost, adjoin, create_aduser_group):
"""
@@ -2270,7 +2244,6 @@ def test_0027_ad_parameters_group_membership_empty(
assert aduser in grp_cmd.stdout_text, f"{aduser} not in getent out."
@staticmethod
- @pytest.mark.tier1
def test_0028_ad_parameters_nested_in_nonposix_group(
multihost, adjoin, create_aduser_group):
"""
@@ -2345,7 +2318,6 @@ def test_0028_ad_parameters_nested_in_nonposix_group(
assert group_2 in usr_cmd.stdout_text, f"{group_2} not in id output."
@staticmethod
- @pytest.mark.tier1
def test_0029_ad_parameters_tokengroups_with_ldap(
multihost, adjoin, create_aduser_group):
"""
@@ -2413,7 +2385,6 @@ def test_0029_ad_parameters_tokengroups_with_ldap(
not in log_str
@staticmethod
- @pytest.mark.tier1
def test_0030_ad_parameters_tokengroups_searchbase(
multihost, adjoin, create_aduser_group):
"""
@@ -2513,7 +2484,6 @@ def test_0030_ad_parameters_tokengroups_searchbase(
not in log_str
@staticmethod
- @pytest.mark.tier1
def test_0031_ad_parameters_custom_re(
multihost, adjoin, create_aduser_group):
"""
@@ -2579,7 +2549,6 @@ def test_0031_ad_parameters_custom_re(
assert su_result, "The su command failed!"
@staticmethod
- @pytest.mark.tier1
def test_0032_ad_parameters_group_name_attribute(multihost, adjoin):
"""
:title: IDM-SSSD-TC: ad_provider: ad_parameters: Does sssd ad use
@@ -2662,7 +2631,6 @@ def test_0032_ad_parameters_group_name_attribute(multihost, adjoin):
assert grp2_cmd.returncode == 0, f"{test_group_mod} was not found."
@staticmethod
- @pytest.mark.tier1
def test_0033_ad_parameters_group_cleanup_sanitize(multihost, adjoin):
"""
:title: IDM-SSSD-TC: ad_provider: ad_parameters: groups cleanup
@@ -2759,7 +2727,6 @@ def test_0033_ad_parameters_group_cleanup_sanitize(multihost, adjoin):
f' with [5]: Input/output error' not in log_str
@staticmethod
- @pytest.mark.tier1
def test_0034_ad_parameters_group_work_intermittently(multihost, adjoin):
"""
:title: IDM-SSSD-TC: ad_provider: ad_parameters: sssd ad groups
@@ -2846,7 +2813,6 @@ def test_0034_ad_parameters_group_work_intermittently(multihost, adjoin):
assert group in usr2_cmd.stdout_text, "{group} is missing.(3)"
@staticmethod
- @pytest.mark.tier1
def test_0035_ad_parameters_delete_cache(
multihost, adjoin, create_aduser_group):
"""
@@ -2975,7 +2941,6 @@ def test_0035_ad_parameters_delete_cache(
assert usr_cmd_4.returncode == 0, f"{user2} is not in domain users"
@staticmethod
- @pytest.mark.tier1
def test_0036_ad_parameters_renewal_leaks_descriptors(multihost, adjoin):
"""
:title: IDM-SSSD-TC: ad_provider: ad_parameters: The AD keytab
@@ -3048,7 +3013,6 @@ def test_0036_ad_parameters_renewal_leaks_descriptors(multihost, adjoin):
f" stable:{stable}, final: {final}."
@staticmethod
- @pytest.mark.tier1
def test_0037_ad_parameters_extra_attrs_mail(multihost, adjoin):
"""
:title: IDM-SSSD-TC: ad_provider: ad_parameters: SSSD fails to start
@@ -3091,7 +3055,6 @@ def test_0037_ad_parameters_extra_attrs_mail(multihost, adjoin):
client.clear_sssd_cache()
@staticmethod
- @pytest.mark.tier1
def test_0038_ad_parameters_authentication_failure_invalid_keytab(
multihost, adjoin, create_aduser_group):
"""
@@ -3217,7 +3180,6 @@ def test_0038_ad_parameters_authentication_failure_invalid_keytab(
f"{ad_domain}", log_str)
@staticmethod
- @pytest.mark.tier1
def test_0039_ad_parameters_auth_krb5(
multihost, adjoin, create_aduser_group):
"""
@@ -3287,7 +3249,6 @@ def test_0039_ad_parameters_auth_krb5(
assert su_result, "The su command failed!"
@staticmethod
- @pytest.mark.tier1
def test_0040_ad_parameters_newline_ssh_key(
multihost, adjoin, create_aduser_group):
"""
@@ -3409,7 +3370,6 @@ def test_0040_ad_parameters_newline_ssh_key(
" ending newline."
@staticmethod
- @pytest.mark.tier1
def test_0041_ad_parameters_sss_ssh_knownhostsproxy(
multihost, adjoin, create_aduser_group):
"""
@@ -3508,7 +3468,6 @@ def test_0041_ad_parameters_sss_ssh_knownhostsproxy(
log_str)
@staticmethod
- @pytest.mark.tier1
def test_0042_ad_parameters_nonroot_user_sssd(
multihost, adjoin, create_aduser_group):
"""
From b4d4aa78ee1c53170d6fa3ebd6b40f8f23cbe945 Mon Sep 17 00:00:00 2001
From: Steeve Goveas <sgov...@redhat.com>
Date: Wed, 6 Oct 2021 13:35:51 +0530
Subject: [PATCH 2/2] Test: fix the restore of ldap.conf in
test_0016_forceLDAPS
---
src/tests/multihost/ad/test_adparameters.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tests/multihost/ad/test_adparameters.py b/src/tests/multihost/ad/test_adparameters.py
index 2967709229..6e8e16fa94 100644
--- a/src/tests/multihost/ad/test_adparameters.py
+++ b/src/tests/multihost/ad/test_adparameters.py
@@ -636,7 +636,7 @@ def test_0016_forceLDAPS(self, multihost,
multihost.client[0].run_command(cmd, raiseonerr=True)
cmd = 'dnf remove -y firewalld'
multihost.client[0].run_command(cmd, raiseonerr=True)
- cert_restr = 'mv /etc/openldap/ldap.conf_bk /etc/openldap.conf'
+ cert_restr = 'mv /etc/openldap.conf_bk /etc/openldap/ldap.conf'
cmd = multihost.client[0].run_command(cert_restr, raiseonerr=False)
multihost.client[0].service_sssd('stop')
client.sssd_conf(domain_section, sssd_params, action='delete')
_______________________________________________
sssd-devel mailing list -- sssd-devel@lists.fedorahosted.org
To unsubscribe send an email to sssd-devel-le...@lists.fedorahosted.org
Fedora Code of Conduct:
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives:
https://lists.fedorahosted.org/archives/list/sssd-devel@lists.fedorahosted.org
Do not reply to spam on the list, report it:
https://pagure.io/fedora-infrastructure
