diff --git a/ipatests/test_cmdline/test_ipagetkeytab.py b/ipatests/test_cmdline/test_ipagetkeytab.py index e712279bb..6a1314f6c 100644 --- a/ipatests/test_cmdline/test_ipagetkeytab.py +++ b/ipatests/test_cmdline/test_ipagetkeytab.py @@ -22,15 +22,16 @@ Test `ipa-getkeytab` import os import shutil -from cmdline import cmdline_test +import tempfile + +import gssapi +import pytest + from ipalib import api from ipalib import errors -import tempfile from ipapython import ipautil, ipaldap -import tempfile -import gssapi from ipaserver.plugins.ldap2 import ldap2 -import pytest +from ipatests.test_cmdline.cmdline import cmdline_test def use_keytab(principal, keytab): try: diff --git a/ipatests/test_integration/test_topology.py b/ipatests/test_integration/test_topology.py index ec3d1de97..8119aa9d7 100644 --- a/ipatests/test_integration/test_topology.py +++ b/ipatests/test_integration/test_topology.py @@ -4,11 +4,12 @@ import re import time + import pytest from ipatests.test_integration.base import IntegrationTest from ipatests.test_integration import tasks -from env_config import get_global_config +from ipatests.test_integration.env_config import get_global_config from ipalib.constants import DOMAIN_SUFFIX_NAME config = get_global_config()