From 979c25f38dbdeb9a479884e276d19e34bf7815d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20V=C3=A1vra?= Date: Mon, 27 May 2024 16:00:40 +0200 Subject: [PATCH] Tests: Update ad multiforest and multidomain suites. Reviewed-by: Alexey Tikhonov --- src/tests/multihost/admultidomain/test_multidomain.py | 10 +++++----- src/tests/multihost/admultidomain/test_multiforest.py | 11 +++++------ 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/tests/multihost/admultidomain/test_multidomain.py b/src/tests/multihost/admultidomain/test_multidomain.py index bf1512d8e25..46074669706 100644 --- a/src/tests/multihost/admultidomain/test_multidomain.py +++ b/src/tests/multihost/admultidomain/test_multidomain.py @@ -10,7 +10,7 @@ class TestADMultiDomain(object): @staticmethod - def test_0001_bz2013297(self, multihost, newhostname, adchildjoin): + def test_0001_bz2013297(multihost, newhostname, adchildjoin): """ :title: IDM-SSSD-TC: ad_provider: forests: disabled root domain causes subdomains to be marked offline :id: 3055d093-8449-4146-a6e1-b221dee35395 @@ -88,7 +88,7 @@ def test_0001_bz2013297(self, multihost, newhostname, adchildjoin): assert getent_child_user2.returncode == 0 @staticmethod - def test_0002_bz2018432(self, multihost, newhostname, adjoin): + def test_0002_bz2018432(multihost, newhostname, adjoin): """ :title: IDM-SSSD-TC: ad_provider: forests: sssctl domain_list shows more domains than it should :id: b2c9efc8-b3a6-4216-99d6-7ae1d868c43f @@ -136,7 +136,7 @@ def test_0002_bz2018432(self, multihost, newhostname, adjoin): assert domain_list == multihost_list @staticmethod - def test_0003_bz2167728(self, multihost, newhostname, adchildjoin): + def test_0003_bz2167728(multihost, newhostname, adchildjoin): """ :title: IDM-SSSD-TC: ad_provider: forests: bz2167728 Auth fails if client cannot speak to forest root domain :id: e9ba9423-0a42-4379-a900-637c79ff0e5c @@ -185,9 +185,9 @@ def test_0003_bz2167728(self, multihost, newhostname, adchildjoin): getent3 = multihost.client[0].run_command(f'getent passwd tree_user1@{tree_domain}', raiseonerr=False) multihost.client[0].put_file_contents('/etc/krb5.conf', krb5) - multihost.client[0].run_command('chattr -i /etc/resolv.conf', raiseonerror=False) + multihost.client[0].run_command('chattr -i /etc/resolv.conf', raiseonerr=False) multihost.client[0].put_file_contents('/etc/resolv.conf', resolv) - multihost.client[0].run_command('chattr +i /etc/resolv.conf', raiseonerror=False) + multihost.client[0].run_command('chattr +i /etc/resolv.conf', raiseonerr=False) client.restore_sssd_conf() assert getent1.returncode == 0, f'Could not find user1@{domain}!' diff --git a/src/tests/multihost/admultidomain/test_multiforest.py b/src/tests/multihost/admultidomain/test_multiforest.py index cd710036b0a..c1de4100a37 100644 --- a/src/tests/multihost/admultidomain/test_multiforest.py +++ b/src/tests/multihost/admultidomain/test_multiforest.py @@ -10,7 +10,7 @@ class TestADMultiForest(object): @staticmethod - def test_0001_multiforest(self, multihost, newhostname, adjoin): + def test_0001_multiforest(multihost, newhostname, adjoin): """ :title: IDM-SSSD-TC: ad_provider: admultiforest : Authentication against two forests :id: 900f2467-1aca-430c-bbaa-b22d30a829ad @@ -32,11 +32,11 @@ def test_0001_multiforest(self, multihost, newhostname, adjoin): ad_domain = multihost.ad[0].domainname ad_server = multihost.ad[0].hostname # The second forest domain must be the last entry in the metadata file - ad1_ip = multihost.ad[len(multihost.ad)-1].ip - ad1_domain = multihost.ad[len(multihost.ad)-1].domainname + ad1_ip = multihost.ad[len(multihost.ad) - 1].ip + ad1_domain = multihost.ad[len(multihost.ad) - 1].domainname ad1_domain_upper = str.upper(ad1_domain) - ad1_server = multihost.ad[len(multihost.ad)-1].hostname - ad1_password = multihost.ad[len(multihost.ad)-1].ssh_password + ad1_server = multihost.ad[len(multihost.ad) - 1].hostname + ad1_password = multihost.ad[len(multihost.ad) - 1].ssh_password hosts = multihost.client[0].get_file_contents('/etc/hosts', encoding='utf-8') hosts_new = hosts + f'{ad1_ip} {ad1_server}' @@ -115,4 +115,3 @@ def test_0001_multiforest(self, multihost, newhostname, adjoin): assert getent_domain1_user2.returncode == 0, f"Could not find user2 {getent_domain1_user2}!" assert id_domain1_user1.returncode == 0, f"Could not find user1 {id_domain1_user1}!" assert id_domain1_user2.returncode == 0, f"Could not find user2 {id_domain1_user2}!" -