From f753ad322dfdd81907a309827bddfcb1e47917a7 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: May 05 2016 14:42:46 +0000 Subject: test_xmlrpc: Use absolute imports In Python 3, a module from the current package can be imported either with the absolute name or by using an explicit relative import. Part of the work for https://fedorahosted.org/freeipa/ticket/4985 Reviewed-By: Martin Basti Reviewed-By: Petr Spacek --- diff --git a/ipatests/test_xmlrpc/test_add_remove_cert_cmd.py b/ipatests/test_xmlrpc/test_add_remove_cert_cmd.py index 122921d..0810182 100644 --- a/ipatests/test_xmlrpc/test_add_remove_cert_cmd.py +++ b/ipatests/test_xmlrpc/test_add_remove_cert_cmd.py @@ -4,13 +4,13 @@ import base64 -from ipalib import api, errors +import pytest -from ipatests.util import assert_deepequal, raises -from xmlrpc_test import XMLRPC_test +from ipalib import api, errors from ipapython.dn import DN -from testcert import get_testcert -import pytest +from ipatests.util import assert_deepequal, raises +from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test +from ipatests.test_xmlrpc.testcert import get_testcert @pytest.mark.tier1 diff --git a/ipatests/test_xmlrpc/test_user_plugin.py b/ipatests/test_xmlrpc/test_user_plugin.py index a70b90a..7c6d2ee 100644 --- a/ipatests/test_xmlrpc/test_user_plugin.py +++ b/ipatests/test_xmlrpc/test_user_plugin.py @@ -33,7 +33,7 @@ from ipalib import api, errors from ipatests.test_xmlrpc import objectclasses from ipatests.util import ( assert_deepequal, assert_equal, assert_not_equal, raises) -from xmlrpc_test import ( +from ipatests.test_xmlrpc.xmlrpc_test import ( XMLRPC_test, fuzzy_digits, fuzzy_uuid, fuzzy_password, fuzzy_string, fuzzy_dergeneralizedtime, add_sid, add_oc, raises_exact) from ipapython.dn import DN