Skip to content

Commit

Permalink
[6.15.z] Workaround for some ext auth tests for PR13737 which broke C…
Browse files Browse the repository at this point in the history
…SV handling (#14426)

Workaround for some ext auth tests for PR13737 which broke CSV handling (#14423)

(cherry picked from commit f21de52)

Co-authored-by: Lukáš Hellebrandt <[email protected]>
  • Loading branch information
Satellite-QE and lhellebr authored Mar 19, 2024
1 parent cf0d0cb commit 52dd606
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions pytest_fixtures/component/satellite_auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -456,10 +456,10 @@ def configure_hammer_no_negotiate(parametrized_enrolled_sat):
def hammer_logout(parametrized_enrolled_sat):
"""Logout in Hammer."""
result = parametrized_enrolled_sat.cli.Auth.logout()
assert result[0]['message'] == LOGGEDOUT
assert result.split("\n")[1] == LOGGEDOUT
yield
result = parametrized_enrolled_sat.cli.Auth.logout()
assert result[0]['message'] == LOGGEDOUT
assert result.split("\n")[1] == LOGGEDOUT


@pytest.fixture
Expand Down
2 changes: 1 addition & 1 deletion tests/foreman/cli/test_ldapauthsource.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ def test_positive_refresh_usergroup_with_ad(self, member_group, ad_data, module_
result = module_target_sat.cli.Auth.with_user(
username=ad_data['ldap_user_name'], password=ad_data['ldap_user_passwd']
).status()
assert LOGEDIN_MSG.format(ad_data['ldap_user_name']) in result[0]['message']
assert LOGEDIN_MSG.format(ad_data['ldap_user_name']) in result.split("\n")[1]
module_target_sat.cli.UserGroupExternal.refresh(
{'user-group-id': user_group['id'], 'name': member_group}
)
Expand Down

0 comments on commit 52dd606

Please sign in to comment.