summaryrefslogtreecommitdiffstats
path: root/ipatests
diff options
context:
space:
mode:
authorJan Cholasta <jcholast@redhat.com>2016-11-22 17:55:10 +0100
committerMartin Basti <mbasti@redhat.com>2016-11-29 14:50:51 +0100
commita1f260d021bf5d018e634438fde6b7c81ebbbcef (patch)
tree29f979f42913f804514f92ada0cb953fdb6d095f /ipatests
parent8e5d2c7014ff6371a3b306e666c301aea1f7a488 (diff)
downloadfreeipa-a1f260d021bf5d018e634438fde6b7c81ebbbcef.tar.gz
freeipa-a1f260d021bf5d018e634438fde6b7c81ebbbcef.tar.xz
freeipa-a1f260d021bf5d018e634438fde6b7c81ebbbcef.zip
ipapython: move dnssec, p11helper and secrets to ipaserver
The dnssec and secrets subpackages and the p11helper module depend on ipaplatform. Move them to ipaserver as they are used only on the server. https://fedorahosted.org/freeipa/ticket/6474 Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
Diffstat (limited to 'ipatests')
-rw-r--r--ipatests/test_ipaserver/test_dnssec.py (renamed from ipatests/test_ipapython/test_dnssec.py)4
-rw-r--r--ipatests/test_ipaserver/test_ipap11helper.py (renamed from ipatests/test_ipapython/test_ipap11helper.py)2
-rw-r--r--ipatests/test_ipaserver/test_secrets.py (renamed from ipatests/test_ipapython/test_secrets.py)2
3 files changed, 4 insertions, 4 deletions
diff --git a/ipatests/test_ipapython/test_dnssec.py b/ipatests/test_ipaserver/test_dnssec.py
index c4b830e72..b90f69e13 100644
--- a/ipatests/test_ipapython/test_dnssec.py
+++ b/ipatests/test_ipaserver/test_dnssec.py
@@ -2,11 +2,11 @@
# Copyright (C) 2016 FreeIPA Contributors see COPYING for license
#
"""
-Test the `ipapython/dnssec` package.
+Test the `ipaserver/dnssec` package.
"""
import dns.name
-from ipapython.dnssec.odsmgr import ODSZoneListReader
+from ipaserver.dnssec.odsmgr import ODSZoneListReader
ZONELIST_XML = """<?xml version="1.0" encoding="UTF-8"?>
diff --git a/ipatests/test_ipapython/test_ipap11helper.py b/ipatests/test_ipaserver/test_ipap11helper.py
index 2c8fd2892..c0c8b24bb 100644
--- a/ipatests/test_ipapython/test_ipap11helper.py
+++ b/ipatests/test_ipaserver/test_ipap11helper.py
@@ -17,7 +17,7 @@ import tempfile
import pytest
from ipaplatform.paths import paths
-from ipapython import p11helper as _ipap11helper
+from ipaserver import p11helper as _ipap11helper
pytestmark = pytest.mark.tier0
diff --git a/ipatests/test_ipapython/test_secrets.py b/ipatests/test_ipaserver/test_secrets.py
index 9fbf825d2..40daed67f 100644
--- a/ipatests/test_ipapython/test_secrets.py
+++ b/ipatests/test_ipaserver/test_secrets.py
@@ -1,7 +1,7 @@
# Copyright (C) 2015 FreeIPA Project Contributors - see LICENSE file
from __future__ import print_function
-from ipapython.secrets.store import iSecStore, NAME_DB_MAP, NSSCertDB
+from ipaserver.secrets.store import iSecStore, NAME_DB_MAP, NSSCertDB
import os
import shutil
import subprocess