Imported Debian patch 4.7.2-3

This commit is contained in:
Timo Aaltonen
2019-05-06 08:43:34 +03:00
committed by Mario Fetka
parent 27edeba051
commit 8bc559c5a1
917 changed files with 1068993 additions and 1184676 deletions

View File

@@ -12,6 +12,7 @@ from ipalib import errors, api
from ipapython import ipautil
from ipaplatform.paths import paths
from ipatests.test_util import yield_fixture
from ipatests.util import MockLDAP
from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test
from ipatests.test_xmlrpc.tracker.user_plugin import UserTracker
@@ -50,7 +51,7 @@ TRACKER_DATA = [
]
@pytest.fixture
@yield_fixture
def trusted_domain():
"""Fixture providing mocked AD trust entries
@@ -68,7 +69,7 @@ def trusted_domain():
ldap.del_entry(trusted_dom['dn'])
@pytest.fixture
@yield_fixture
def trusted_domain_with_suffix():
"""Fixture providing mocked AD trust entries