IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

ipatests: always skip additional input for group-add-member --external

Browse Source 
'ipa group-add-member groupname --external some-object' will attempt to
ask interactive questions about other optional parameters (users and
groups) if only external group member was specified. This leads to a
timeout in the tests as there is no input provided.

Do not wait for the entry that would never come by using 'ipa -n'.

Related: https://pagure.io/freeipa/issue/8236
Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
Reviewed-By: Florence Blanc-Renaud <frenaud@redhat.com>
Reviewed-By: Sergey Orlov <sorlov@redhat.com>
This commit is contained in:
Alexander Bokovoy 2020-03-23 23:04:04 +02:00
parent 45b5384b6e
commit c1c45df4b2
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ipatests/test_integration/test_sssd.py
View File

@ -11,6 +11,7 @@ from contextlib import contextmanager
import re import re
import pytest import pytest
import subprocess
import textwrap import textwrap
from ipatests.test_integration.base import IntegrationTest from ipatests.test_integration.base import IntegrationTest
@ -19,7 +20,6 @@ from ipaplatform.tasks import tasks as platform_tasks
from ipaplatform.osinfo import osinfo from ipaplatform.osinfo import osinfo
from ipaplatform.paths import paths from ipaplatform.paths import paths
from ipapython.dn import DN from ipapython.dn import DN
from ipalib import errors
class TestSSSDWithAdTrust(IntegrationTest): class TestSSSDWithAdTrust(IntegrationTest):
@ -318,9 +318,8 @@ class TestSSSDWithAdTrust(IntegrationTest):
self.master.run_command( self.master.run_command(
['ipa', 'group-add-member', '--group', ext_group, user]) ['ipa', 'group-add-member', '--group', ext_group, user])
self.master.run_command([ self.master.run_command([
'ipa', 'group-add-member', '--external', 'ipa', '-n', 'group-add-member', '--external',
self.users['ad']['name'], ext_group, self.users['ad']['name'], ext_group])
'--users=', '--groups='])
tasks.clear_sssd_cache(self.master) tasks.clear_sssd_cache(self.master)
tasks.clear_sssd_cache(client) tasks.clear_sssd_cache(client)
try: try:
@ -344,11 +343,11 @@ class TestSSSDWithAdTrust(IntegrationTest):
master.run_command(['ipa', 'group-add', '--external', master.run_command(['ipa', 'group-add', '--external',
'ext-ipatest']) 'ext-ipatest'])
try: try:
master.run_command(['ipa', 'group-add-member', master.run_command(['ipa', '-n', 'group-add-member',
'ext-ipatest', 'ext-ipatest',
'--external', '--external',
self.users[user_origin]['name']]) self.users[user_origin]['name']])
except errors.ValidationError: except subprocess.CalledProcessError:
# Only 'ipa' origin should throw a validation error # Only 'ipa' origin should throw a validation error
assert user_origin == 'ipa' assert user_origin == 'ipa'
finally: finally: