Skip to content

Commit 5be9c41

Browse files
spoore1alexey-tikhonov
authored andcommitted
Revert "Tests: gdm utils and topology updates for xidp"
This reverts commit 9e4c3dd. This commit was causing failures due to insufficient checks in topology controller code for GDM.
1 parent ee0fb02 commit 5be9c41

3 files changed

Lines changed: 1 addition & 15 deletions

File tree

sssd_test_framework/topology.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ def test_ldap(client: Client, ldap: LDAP):
6666
name="gdm",
6767
topology=Topology(TopologyDomain("sssd", client=1, ipa=1, keycloak=1)),
6868
controller=GDMTopologyController(),
69-
domains=dict(test="sssd.ipa[0]"),
7069
fixtures=dict(client="sssd.client[0]", ipa="sssd.ipa[0]", provider="sssd.ipa[0]", keycloak="sssd.keycloak[0]"),
7170
)
7271
"""

sssd_test_framework/topology_controllers.py

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -290,19 +290,6 @@ def topology_setup(self, client: ClientHost, ipa: IPAHost, keycloak: KeycloakHos
290290

291291
self.logger.info(f"Enrolling IPA server {ipa.hostname} into {keycloak.hostname} by creating an IdP client")
292292

293-
self.logger.info(f"Enrolling {client.hostname} into {ipa.domain}")
294-
295-
# Remove any existing Kerberos configuration and keytab
296-
client.fs.rm("/etc/krb5.conf")
297-
client.fs.rm("/etc/krb5.keytab")
298-
299-
# Backup ipa-client-install files
300-
client.fs.backup("/etc/ipa")
301-
client.fs.backup("/var/lib/ipa-client")
302-
303-
# Join ipa domain
304-
client.conn.exec(["realm", "join", ipa.domain], input=ipa.adminpw)
305-
306293
# Create an IdP client
307294
keycloak.kclogin()
308295
keycloak.conn.run(

sssd_test_framework/utils/gdm.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def assert_text(self, word: str) -> bool:
5656
if not self.init_completed:
5757
self.init()
5858

59-
result = self.host.conn.exec([*self.cmd, "assert-text", word], raise_on_error=False)
59+
result = self.host.conn.exec([*self.cmd, "assert-text", word])
6060
return result.rc == 0
6161

6262
def click_on(self, word: str) -> bool:

0 commit comments

Comments
 (0)