URL: https://github.com/SSSD/sssd/pull/5618
Author: sgoveas
Title: #5618: Test: modify check for rhel version before package install
Action: opened
PR body:
"""
Include check for rhel9 and remove nss-pam-ldapd install for rhel9 as it
wont be available. Test with nss-pam-ldap only for rhel8.
"""
To pull the PR as Git branch:
git remote add ghsssd https://github.com/SSSD/sssd
git fetch ghsssd pull/5618/head:pr5618
git checkout pr5618
From 2ebf917e7246b14f22288637458621ffb5eed4fa Mon Sep 17 00:00:00 2001
From: Steeve Goveas <sgov...@redhat.com>
Date: Wed, 10 Mar 2021 17:26:27 +0530
Subject: [PATCH] modify check for rhel version before package install
Include check for rhel9 and remove nss-pam-ldapd install for rhel9 as it
wont be available. Test with nss-pam-ldap only for rhel8.
---
src/tests/multihost/ad/test_sudo.py | 1 +
.../alltests/test_password_policy.py | 1 +
src/tests/multihost/basic/conftest.py | 6 ++---
.../multihost/sssd/testlib/common/utils.py | 22 +++++++++----------
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/tests/multihost/ad/test_sudo.py b/src/tests/multihost/ad/test_sudo.py
index 2c3e49a25f..f61bd4a675 100644
--- a/src/tests/multihost/ad/test_sudo.py
+++ b/src/tests/multihost/ad/test_sudo.py
@@ -7,6 +7,7 @@
"""
import pytest
import paramiko
+import time
from sssd.testlib.common.utils import SSHClient
from sssd.testlib.common.utils import sssdTools
diff --git a/src/tests/multihost/alltests/test_password_policy.py b/src/tests/multihost/alltests/test_password_policy.py
index b3d4963157..721e50b5ce 100644
--- a/src/tests/multihost/alltests/test_password_policy.py
+++ b/src/tests/multihost/alltests/test_password_policy.py
@@ -39,6 +39,7 @@ def test_0001_chnageuserpass(self, multihost):
domain_parameter = {'ldap_pwmodify_mode': value}
tools.sssd_conf(section, domain_parameter, action='update')
tools.clear_sssd_cache()
+ time.sleep(5)
change_pass = tools.change_user_password(user, 'Secret123',
'Secret123',
'bumblebee@123',
diff --git a/src/tests/multihost/basic/conftest.py b/src/tests/multihost/basic/conftest.py
index 413d1d7b18..b0b7a8fb86 100644
--- a/src/tests/multihost/basic/conftest.py
+++ b/src/tests/multihost/basic/conftest.py
@@ -40,12 +40,10 @@ def package_install(session_multihost):
'openldap-clients krb5-workstation '\
'sssd sssd-dbus sssd-kcm ' \
'expect ldb-tools sssd-tools'
- if 'Fedora' in distro:
- cmd = 'dnf install -y %s' % (pkg_list)
- elif '8.' in distro.split()[5]:
+ cmd = 'yum install -y %s' % (pkg_list)
+ if '8.' in distro.split()[5]:
enableidm = 'yum -y module enable idm:DL1'
session_multihost.master[0].run_command(enableidm)
- cmd = 'yum install -y %s' % (pkg_list)
session_multihost.master[0].run_command(cmd)
diff --git a/src/tests/multihost/sssd/testlib/common/utils.py b/src/tests/multihost/sssd/testlib/common/utils.py
index a230525a45..a971339617 100644
--- a/src/tests/multihost/sssd/testlib/common/utils.py
+++ b/src/tests/multihost/sssd/testlib/common/utils.py
@@ -62,11 +62,15 @@ def client_install_pkgs(self):
pkgs = 'adcli realmd samba samba-common-tools krb5-workstation '\
'oddjob oddjob-mkhomedir ldb-tools samba-winbind '\
'samba-winbind-clients autofs nfs-utils authconfig '\
- 'authselect nss-pam-ldapd cifs-utils openldap-clients '\
+ 'authselect cifs-utils openldap-clients '\
'tcpdump wireshark-cli expect rsyslog gcc gcc-c++ pam-devel '\
'tdb-tools libkcapi-hmaccalc'
sssd_pkgs = 'sssd sssd-tools sssd-proxy sssd-winbind-idmap '\
'libsss_autofs libsss_simpleifp sssd-kcm sssd-dbus'
+ extra_pkg = ' nss-pam-ldapd'
+ distro = self.multihost.distro
+ if '8.' in distro:
+ pkgs = pkgs + extra_pkg
self.multihost.package_mgmt(pkgs, action='install')
self.multihost.package_mgmt(sssd_pkgs, action='install')
@@ -74,17 +78,13 @@ def server_install_pkgs(self):
""" Install common required packages on server"""
pkgs = 'adcli realmd samba samba-common-tools krb5-workstation '\
'samba-winbind-clients nfs-utils authconfig openldap-clients '\
- 'authselect krb5-server cifs-utils expect rsyslog'
+ 'authselect krb5-server cifs-utils expect rsyslog 389-ds-base'
sssd_pkgs = 'sssd sssd-tools sssd-proxy sssd-winbind-idmap '\
'libsss_autofs libsss_simpleifp sssd-kcm sssd-dbus'
- if '8.' in self.multihost.distro:
+ distro = self.multihost.distro
+ if '8.' in distro:
enable_idm = 'yum module enable idm:DL1 -y'
self.multihost.run_command(enable_idm)
- ds_pkgs = ' 389-ds-base'
- pkgs = pkgs + ds_pkgs
- if 'Fedora' in self.multihost.distro:
- ds_pkgs = ' 389-ds-base'
- pkgs = pkgs + ds_pkgs
self.multihost.package_mgmt(pkgs, action='install')
self.multihost.package_mgmt(sssd_pkgs, action='install')
@@ -244,12 +244,12 @@ def authselect(self):
def systemsssdauth(self, realm, krb_server):
""" Run authconfig/authselect to enable sssd authentication """
distro = self.multihost.distro
- if '8.' in distro or 'Fedora' in distro:
+ if '7.' in distro:
+ self.config_authconfig(krb_server, realm)
+ else:
self.authselect()
self.config_etckrb5(realm, krb_server)
self.enable_kcm()
- else:
- self.config_authconfig(krb_server, realm)
def update_conf(self, conffile, section, parameters, action='add'):
""" Update configuration files """
_______________________________________________
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
