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

py3: test_kerberos_principal_aliases: fix code scope

Browse Source 
In py3 the variable is valid only in the block where it is defined. We
must move test definition to global scope.

https://pagure.io/freeipa/issue/4985

Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
This commit is contained in:
Martin Basti 2017-06-22 12:10:25 +02:00
parent c422206cc7
commit 8116a7b450
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -50,7 +50,8 @@ env:
test_xmlrpc/test_hbactest_plugin.py test_xmlrpc/test_hbactest_plugin.py
test_xmlrpc/test_host_plugin.py test_xmlrpc/test_host_plugin.py
test_xmlrpc/test_hostgroup_plugin.py test_xmlrpc/test_hostgroup_plugin.py
test_xmlrpc/test_krbtpolicy.py" test_xmlrpc/test_krbtpolicy.py
test_xmlrpc/test_kerberos_principal_aliases.py"
### Tests which haven't been ported to py3 yet ### ### Tests which haven't been ported to py3 yet ###
## test_xmlrpc/test_[a-k]*.py ## test_xmlrpc/test_[a-k]*.py
# test_xmlrpc/test_ca_plugin.py # test_xmlrpc/test_ca_plugin.py
@ -60,7 +61,6 @@ env:
# test_xmlrpc/test_dns_realmdomains_integration.py # test_xmlrpc/test_dns_realmdomains_integration.py
# test_xmlrpc/test_external_members.py # test_xmlrpc/test_external_members.py
# test_xmlrpc/test_idviews_plugin.py # test_xmlrpc/test_idviews_plugin.py
# test_xmlrpc/test_kerberos_principal_aliases.py
- TASK_TO_RUN="run-tests" - TASK_TO_RUN="run-tests"
PYTHON=/usr/bin/python3 PYTHON=/usr/bin/python3
TEST_RUNNER_CONFIG=".test_runner_config_py3_temp.yaml" TEST_RUNNER_CONFIG=".test_runner_config_py3_temp.yaml"

33
ipatests/test_xmlrpc/test_kerberos_principal_aliases.py
View File

@ -33,6 +33,21 @@ TRUSTED_DOMAIN_MOCK['ldif'] = get_trusted_dom_dict(
TRUSTED_DOMAIN_MOCK['name'], TRUSTED_DOMAIN_MOCK['sid'] TRUSTED_DOMAIN_MOCK['name'], TRUSTED_DOMAIN_MOCK['sid']
) )
ADD_REMOVE_TEST_DATA = [
u'testuser-alias',
u'testhost-alias',
u'teststageuser-alias',
]
TRACKER_INIT_DATA = [
(UserTracker, (u'krbalias_user', u'krbalias', u'test',), {},),
(HostTracker, (u'testhost-krb',), {},),
(StageUserTracker, (u'krbalias_stageuser', u'krbalias', u'test',), {},),
]
TRACKER_DATA = [
(ADD_REMOVE_TEST_DATA[i],) + TRACKER_INIT_DATA[i]
for i in range(len(TRACKER_INIT_DATA))
]
@yield_fixture @yield_fixture
def trusted_domain(): def trusted_domain():
@ -117,31 +132,17 @@ def ldapservice(request):
tracker.track_create() tracker.track_create()
return tracker return tracker
class TestKerberosAliasManipulation(XMLRPC_test): class TestKerberosAliasManipulation(XMLRPC_test):
add_remove_test_data = [
u'testuser-alias',
u'testhost-alias',
u'teststageuser-alias',
]
tracker_init_data = [
(UserTracker, (u'krbalias_user', u'krbalias', u'test',), {},),
(HostTracker, (u'testhost-krb',), {},),
(StageUserTracker, (u'krbalias_stageuser', u'krbalias', u'test',), {},),
]
tracker_data = [(add_remove_test_data[i],) + tracker_init_data[i]
for i in range(len(tracker_init_data))]
@pytest.mark.parametrize('alias,tracker_cls,tracker_args,tracker_kwargs', @pytest.mark.parametrize('alias,tracker_cls,tracker_args,tracker_kwargs',
tracker_data) TRACKER_DATA)
def test_add_principal_alias(self, alias, krbalias): def test_add_principal_alias(self, alias, krbalias):
krbalias.ensure_exists() krbalias.ensure_exists()
krbalias.add_principal([alias]) krbalias.add_principal([alias])
krbalias.retrieve() krbalias.retrieve()
@pytest.mark.parametrize('alias,tracker_cls,tracker_args,tracker_kwargs', @pytest.mark.parametrize('alias,tracker_cls,tracker_args,tracker_kwargs',
tracker_data) TRACKER_DATA)
def test_remove_principal_alias(self, alias, krbalias): def test_remove_principal_alias(self, alias, krbalias):
krbalias.ensure_exists() krbalias.ensure_exists()
krbalias.add_principal([alias]) krbalias.add_principal([alias])