summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Viktorin <pviktori@redhat.com>2013-05-21 13:40:27 +0200
committerMartin Kosek <mkosek@redhat.com>2013-06-17 19:22:50 +0200
commitc60142efda817f030a7495cd6fe4a19953e55afa (patch)
tree31a840ceddd4381311bbc879f9851bb71a8e2ffa
parent6d66e826c1c248dffc80056b20c1e4b74b04d46f (diff)
downloadfreeipa-c60142efda817f030a7495cd6fe4a19953e55afa.zip
freeipa-c60142efda817f030a7495cd6fe4a19953e55afa.tar.gz
freeipa-c60142efda817f030a7495cd6fe4a19953e55afa.tar.xz
Make an ipa-tests package
Rename the 'tests' directory to 'ipa-tests', and create an ipa-tests RPM containing the test suite Part of the work for: https://fedorahosted.org/freeipa/ticket/3654
-rw-r--r--.gitignore1
-rw-r--r--Makefile16
-rw-r--r--freeipa.spec.in43
-rw-r--r--install/po/Makefile.in4
-rw-r--r--ipatests/__init__.py (renamed from tests/__init__.py)0
-rw-r--r--ipatests/data.py (renamed from tests/data.py)0
-rwxr-xr-xipatests/i18n.py (renamed from tests/i18n.py)0
-rw-r--r--ipatests/setup.py.in87
-rw-r--r--ipatests/test_cmdline/cmdline.py (renamed from tests/test_cmdline/cmdline.py)2
-rw-r--r--ipatests/test_cmdline/test_cli.py (renamed from tests/test_cmdline/test_cli.py)2
-rw-r--r--ipatests/test_cmdline/test_help.py (renamed from tests/test_cmdline/test_help.py)0
-rw-r--r--ipatests/test_cmdline/test_ipagetkeytab.py (renamed from tests/test_cmdline/test_ipagetkeytab.py)0
-rw-r--r--ipatests/test_install/0_reset.update (renamed from tests/test_install/0_reset.update)0
-rw-r--r--ipatests/test_install/1_add.update (renamed from tests/test_install/1_add.update)0
-rw-r--r--ipatests/test_install/2_update.update (renamed from tests/test_install/2_update.update)0
-rw-r--r--ipatests/test_install/3_update.update (renamed from tests/test_install/3_update.update)0
-rw-r--r--ipatests/test_install/4_update.update (renamed from tests/test_install/4_update.update)0
-rw-r--r--ipatests/test_install/5_update.update (renamed from tests/test_install/5_update.update)0
-rw-r--r--ipatests/test_install/6_update.update (renamed from tests/test_install/6_update.update)0
-rw-r--r--ipatests/test_install/8_badsyntax.update (renamed from tests/test_install/8_badsyntax.update)0
-rw-r--r--ipatests/test_install/9_badsyntax.update (renamed from tests/test_install/9_badsyntax.update)0
-rw-r--r--ipatests/test_install/__init__.py (renamed from tests/test_install/__init__.py)0
-rw-r--r--ipatests/test_install/test_updates.py (renamed from tests/test_install/test_updates.py)4
-rw-r--r--ipatests/test_ipalib/__init__.py (renamed from tests/test_ipalib/__init__.py)0
-rw-r--r--ipatests/test_ipalib/test_backend.py (renamed from tests/test_ipalib/test_backend.py)4
-rw-r--r--ipatests/test_ipalib/test_base.py (renamed from tests/test_ipalib/test_base.py)2
-rw-r--r--ipatests/test_ipalib/test_capabilities.py (renamed from tests/test_ipalib/test_capabilities.py)0
-rw-r--r--ipatests/test_ipalib/test_cli.py (renamed from tests/test_ipalib/test_cli.py)2
-rw-r--r--ipatests/test_ipalib/test_config.py (renamed from tests/test_ipalib/test_config.py)6
-rw-r--r--ipatests/test_ipalib/test_crud.py (renamed from tests/test_ipalib/test_crud.py)2
-rw-r--r--ipatests/test_ipalib/test_errors.py (renamed from tests/test_ipalib/test_errors.py)2
-rw-r--r--ipatests/test_ipalib/test_frontend.py (renamed from tests/test_ipalib/test_frontend.py)6
-rw-r--r--ipatests/test_ipalib/test_messages.py (renamed from tests/test_ipalib/test_messages.py)2
-rw-r--r--ipatests/test_ipalib/test_output.py (renamed from tests/test_ipalib/test_output.py)2
-rw-r--r--ipatests/test_ipalib/test_parameters.py (renamed from tests/test_ipalib/test_parameters.py)6
-rw-r--r--ipatests/test_ipalib/test_plugable.py (renamed from tests/test_ipalib/test_plugable.py)8
-rw-r--r--ipatests/test_ipalib/test_rpc.py (renamed from tests/test_ipalib/test_rpc.py)4
-rw-r--r--ipatests/test_ipalib/test_text.py (renamed from tests/test_ipalib/test_text.py)4
-rw-r--r--ipatests/test_ipalib/test_util.py (renamed from tests/test_ipalib/test_util.py)0
-rw-r--r--ipatests/test_ipalib/test_x509.py (renamed from tests/test_ipalib/test_x509.py)6
-rw-r--r--ipatests/test_ipapython/__init__.py (renamed from tests/test_ipapython/__init__.py)0
-rw-r--r--ipatests/test_ipapython/test_cookie.py (renamed from tests/test_ipapython/test_cookie.py)0
-rw-r--r--ipatests/test_ipapython/test_dn.py (renamed from tests/test_ipapython/test_dn.py)0
-rw-r--r--ipatests/test_ipapython/test_ipautil.py (renamed from tests/test_ipapython/test_ipautil.py)0
-rw-r--r--ipatests/test_ipapython/test_keyring.py (renamed from tests/test_ipapython/test_keyring.py)0
-rw-r--r--ipatests/test_ipapython/test_ssh.py (renamed from tests/test_ipapython/test_ssh.py)0
-rw-r--r--ipatests/test_ipaserver/__init__.py (renamed from tests/test_ipaserver/__init__.py)0
-rw-r--r--ipatests/test_ipaserver/httptest.py (renamed from tests/test_ipaserver/httptest.py)0
-rwxr-xr-xipatests/test_ipaserver/install/test_adtrustinstance.py (renamed from tests/test_ipaserver/install/test_adtrustinstance.py)0
-rw-r--r--ipatests/test_ipaserver/test_changepw.py (renamed from tests/test_ipaserver/test_changepw.py)4
-rw-r--r--ipatests/test_ipaserver/test_ldap.py (renamed from tests/test_ipaserver/test_ldap.py)0
-rw-r--r--ipatests/test_ipaserver/test_rpcserver.py (renamed from tests/test_ipaserver/test_rpcserver.py)4
-rw-r--r--ipatests/test_pkcs10/__init__.py (renamed from tests/test_pkcs10/__init__.py)0
-rw-r--r--ipatests/test_pkcs10/test0.csr (renamed from tests/test_pkcs10/test0.csr)0
-rw-r--r--ipatests/test_pkcs10/test1.csr (renamed from tests/test_pkcs10/test1.csr)0
-rw-r--r--ipatests/test_pkcs10/test2.csr (renamed from tests/test_pkcs10/test2.csr)0
-rw-r--r--ipatests/test_pkcs10/test3.csr (renamed from tests/test_pkcs10/test3.csr)0
-rw-r--r--ipatests/test_pkcs10/test4.csr (renamed from tests/test_pkcs10/test4.csr)0
-rw-r--r--ipatests/test_pkcs10/test5.csr (renamed from tests/test_pkcs10/test5.csr)0
-rw-r--r--ipatests/test_pkcs10/test_pkcs10.py (renamed from tests/test_pkcs10/test_pkcs10.py)6
-rw-r--r--ipatests/test_util.py (renamed from tests/test_util.py)0
-rw-r--r--ipatests/test_xmlrpc/__init__.py (renamed from tests/test_xmlrpc/__init__.py)0
-rw-r--r--ipatests/test_xmlrpc/objectclasses.py (renamed from tests/test_xmlrpc/objectclasses.py)0
-rw-r--r--ipatests/test_xmlrpc/test_attr.py (renamed from tests/test_xmlrpc/test_attr.py)2
-rw-r--r--ipatests/test_xmlrpc/test_automember_plugin.py (renamed from tests/test_xmlrpc/test_automember_plugin.py)2
-rw-r--r--ipatests/test_xmlrpc/test_automount_plugin.py (renamed from tests/test_xmlrpc/test_automount_plugin.py)2
-rw-r--r--ipatests/test_xmlrpc/test_baseldap_plugin.py (renamed from tests/test_xmlrpc/test_baseldap_plugin.py)0
-rw-r--r--ipatests/test_xmlrpc/test_batch_plugin.py (renamed from tests/test_xmlrpc/test_batch_plugin.py)4
-rw-r--r--ipatests/test_xmlrpc/test_cert_plugin.py (renamed from tests/test_xmlrpc/test_cert_plugin.py)0
-rw-r--r--ipatests/test_xmlrpc/test_config_plugin.py (renamed from tests/test_xmlrpc/test_config_plugin.py)0
-rw-r--r--ipatests/test_xmlrpc/test_delegation_plugin.py (renamed from tests/test_xmlrpc/test_delegation_plugin.py)2
-rw-r--r--ipatests/test_xmlrpc/test_dns_plugin.py (renamed from tests/test_xmlrpc/test_dns_plugin.py)2
-rw-r--r--ipatests/test_xmlrpc/test_dns_realmdomains_integration.py (renamed from tests/test_xmlrpc/test_dns_realmdomains_integration.py)2
-rw-r--r--ipatests/test_xmlrpc/test_external_members.py (renamed from tests/test_xmlrpc/test_external_members.py)2
-rw-r--r--ipatests/test_xmlrpc/test_group_plugin.py (renamed from tests/test_xmlrpc/test_group_plugin.py)4
-rw-r--r--ipatests/test_xmlrpc/test_hbac_plugin.py (renamed from tests/test_xmlrpc/test_hbac_plugin.py)0
-rw-r--r--ipatests/test_xmlrpc/test_hbacsvcgroup_plugin.py (renamed from tests/test_xmlrpc/test_hbacsvcgroup_plugin.py)4
-rw-r--r--ipatests/test_xmlrpc/test_hbactest_plugin.py (renamed from tests/test_xmlrpc/test_hbactest_plugin.py)0
-rw-r--r--ipatests/test_xmlrpc/test_host_plugin.py (renamed from tests/test_xmlrpc/test_host_plugin.py)6
-rw-r--r--ipatests/test_xmlrpc/test_hostgroup_plugin.py (renamed from tests/test_xmlrpc/test_hostgroup_plugin.py)4
-rw-r--r--ipatests/test_xmlrpc/test_krbtpolicy.py (renamed from tests/test_xmlrpc/test_krbtpolicy.py)2
-rw-r--r--ipatests/test_xmlrpc/test_nesting.py (renamed from tests/test_xmlrpc/test_nesting.py)2
-rw-r--r--ipatests/test_xmlrpc/test_netgroup_plugin.py (renamed from tests/test_xmlrpc/test_netgroup_plugin.py)5
-rw-r--r--ipatests/test_xmlrpc/test_passwd_plugin.py (renamed from tests/test_xmlrpc/test_passwd_plugin.py)0
-rw-r--r--ipatests/test_xmlrpc/test_permission_plugin.py (renamed from tests/test_xmlrpc/test_permission_plugin.py)2
-rw-r--r--ipatests/test_xmlrpc/test_ping_plugin.py (renamed from tests/test_xmlrpc/test_ping_plugin.py)2
-rw-r--r--ipatests/test_xmlrpc/test_privilege_plugin.py (renamed from tests/test_xmlrpc/test_privilege_plugin.py)2
-rw-r--r--ipatests/test_xmlrpc/test_pwpolicy_plugin.py (renamed from tests/test_xmlrpc/test_pwpolicy_plugin.py)0
-rw-r--r--ipatests/test_xmlrpc/test_range_plugin.py (renamed from tests/test_xmlrpc/test_range_plugin.py)4
-rw-r--r--ipatests/test_xmlrpc/test_realmdomains_plugin.py (renamed from tests/test_xmlrpc/test_realmdomains_plugin.py)2
-rw-r--r--ipatests/test_xmlrpc/test_replace.py (renamed from tests/test_xmlrpc/test_replace.py)2
-rw-r--r--ipatests/test_xmlrpc/test_role_plugin.py (renamed from tests/test_xmlrpc/test_role_plugin.py)2
-rw-r--r--ipatests/test_xmlrpc/test_selfservice_plugin.py (renamed from tests/test_xmlrpc/test_selfservice_plugin.py)2
-rw-r--r--ipatests/test_xmlrpc/test_selinuxusermap_plugin.py (renamed from tests/test_xmlrpc/test_selinuxusermap_plugin.py)4
-rw-r--r--ipatests/test_xmlrpc/test_service_plugin.py (renamed from tests/test_xmlrpc/test_service_plugin.py)10
-rw-r--r--ipatests/test_xmlrpc/test_sudocmd_plugin.py (renamed from tests/test_xmlrpc/test_sudocmd_plugin.py)4
-rw-r--r--ipatests/test_xmlrpc/test_sudocmdgroup_plugin.py (renamed from tests/test_xmlrpc/test_sudocmdgroup_plugin.py)2
-rw-r--r--ipatests/test_xmlrpc/test_sudorule_plugin.py (renamed from tests/test_xmlrpc/test_sudorule_plugin.py)0
-rw-r--r--ipatests/test_xmlrpc/test_trust_plugin.py (renamed from tests/test_xmlrpc/test_trust_plugin.py)2
-rw-r--r--ipatests/test_xmlrpc/test_user_plugin.py (renamed from tests/test_xmlrpc/test_user_plugin.py)4
-rw-r--r--ipatests/test_xmlrpc/xmlrpc_test.py (renamed from tests/test_xmlrpc/xmlrpc_test.py)2
-rw-r--r--ipatests/util.py (renamed from tests/util.py)0
-rwxr-xr-xmake-doc2
-rwxr-xr-xmake-lint2
-rwxr-xr-xmake-testcert6
105 files changed, 237 insertions, 93 deletions
diff --git a/.gitignore b/.gitignore
index 1e97f62..8a2829a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -86,3 +86,4 @@ ipapython/setup.py
ipapython/version.py
version.m4
ipapython/services.py
+ipatests/setup.py
diff --git a/Makefile b/Makefile
index 550e529..484144f 100644
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,7 @@ endif
PYTHON ?= $(shell rpm -E %__python)
-all: bootstrap-autogen server
+all: bootstrap-autogen server tests
@for subdir in $(SUBDIRS); do \
(cd $$subdir && $(MAKE) $@) || exit 1; \
done
@@ -71,7 +71,7 @@ client-autogen: version-update
cd ipa-client; if [ ! -e Makefile ]; then ../autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); fi
cd install; if [ ! -e Makefile ]; then ../autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); fi
-install: all server-install
+install: all server-install tests-install
@for subdir in $(SUBDIRS); do \
(cd $$subdir && $(MAKE) $@) || exit 1; \
done
@@ -118,6 +118,8 @@ version-update: release-update
> ipapython/setup.py
sed -e s/__VERSION__/$(IPA_VERSION)/ ipapython/version.py.in \
> ipapython/version.py
+ sed -e s/__VERSION__/$(IPA_VERSION)/ ipatests/setup.py.in \
+ > ipatests/setup.py
perl -pi -e "s:__NUM_VERSION__:$(IPA_NUM_VERSION):" ipapython/version.py
perl -pi -e "s:__API_VERSION__:$(IPA_API_VERSION_MAJOR).$(IPA_API_VERSION_MINOR):" ipapython/version.py
sed -e s/__VERSION__/$(IPA_VERSION)/ daemons/ipa-version.h.in \
@@ -149,6 +151,16 @@ server-install: server
$(PYTHON) setup.py install --root $(DESTDIR); \
fi
+tests: version-update
+ cd ipatests; $(PYTHON) setup.py build
+
+tests-install: tests
+ if [ "$(DESTDIR)" = "" ]; then \
+ cd ipatests; $(PYTHON) setup.py install; \
+ else \
+ cd ipatests; $(PYTHON) setup.py install --root $(DESTDIR); \
+ fi
+
archive:
-mkdir -p dist
git archive --format=tar --prefix=ipa/ $(TARGET) | (cd dist && tar xf -)
diff --git a/freeipa.spec.in b/freeipa.spec.in
index feb5442..7b74eb0 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -290,6 +290,26 @@ user, virtual machines, groups, authentication credentials), Policy
logs, analysis thereof). If you are using IPA you need to install this
package.
+%if ! %{ONLY_CLIENT}
+%package tests
+Summary: IPA tests and test tools
+Requires: %{name}-client = %{version}-%{release}
+Requires: %{name}-python = %{version}-%{release}
+Requires: python-nose
+Requires: python-paste
+Requires: python-coverage
+Requires: python-polib
+
+%description tests
+IPA is an integrated solution to provide centrally managed Identity (machine,
+user, virtual machines, groups, authentication credentials), Policy
+(configuration settings, access control information) and Audit (events,
+logs, analysis thereof).
+This package contains tests that verify IPA functionality.
+
+%endif # ! %{ONLY_CLIENT}
+
+
%prep
%setup -n freeipa-%{version} -q
@@ -432,6 +452,10 @@ install -pm 644 ipa-compliance.cron %{buildroot}%{_sysconfdir}/cron.d/ipa-compli
grep -v dcerpc | grep -v adtrustinstance | \
sed -e 's,\.py.*$,.*,g' | sort -u | \
sed -e 's,\./,%%{python_sitelib}/ipaserver/,g' ) >server-python.list
+
+(cd %{buildroot}/%{python_sitelib}/ipatests && find . -type f | \
+ sed -e 's,\.py.*$,.*,g' | sort -u | \
+ sed -e 's,\./,%%{python_sitelib}/ipatests/,g' ) >tests-python.list
%endif # ! %{ONLY_CLIENT}
%clean
@@ -777,7 +801,26 @@ fi
%ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/default.conf
%ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/ca.crt
+%if ! %{ONLY_CLIENT}
+%files tests -f tests-python.list
+%defattr(-,root,root,-)
+%doc COPYING README Contributors.txt
+%dir %{python_sitelib}/ipatests
+%dir %{python_sitelib}/ipatests/test_cmdline
+%dir %{python_sitelib}/ipatests/test_install
+%dir %{python_sitelib}/ipatests/test_ipalib
+%dir %{python_sitelib}/ipatests/test_ipapython
+%dir %{python_sitelib}/ipatests/test_ipaserver
+%dir %{python_sitelib}/ipatests/test_ipaserver/install
+%dir %{python_sitelib}/ipatests/test_pkcs10
+%dir %{python_sitelib}/ipatests/test_xmlrpc
+%{python_sitelib}/ipatests-*.egg-info
+%endif # ! %{ONLY_CLIENT}
+
%changelog
+* Mon Jun 17 2013 Petr Viktorin <pviktori@redhat.com> - 3.2.99-2
+- Add the freeipa-tests subpackage
+
* Thu Jun 13 2013 Martin Kosek <mkosek@redhat.com> - 3.2.99-1
- Drop freeipa-server-selinux subpackage
- Drop redundant directory /var/cache/ipa/sessions
diff --git a/install/po/Makefile.in b/install/po/Makefile.in
index bc91a93..7ef03c5 100644
--- a/install/po/Makefile.in
+++ b/install/po/Makefile.in
@@ -16,7 +16,7 @@ MSGMERGE = @MSGMERGE@
MSGCMP = @MSGCMP@
MSGATTRIB = @MSGATTRIB@
TX = @TX@
-IPA_TEST_I18N = ../../tests/i18n.py
+IPA_TEST_I18N = ../../ipatests/i18n.py
DOMAIN = @GETTEXT_DOMAIN@
MSGMERGE_UPDATE = $(MSGMERGE) --update
@@ -35,7 +35,7 @@ po_files = $(patsubst %, %.po, $(languages))
mo_files = $(patsubst %.po, %.mo, $(po_files))
po_count=$(words $(po_files))
-PY_FILES = $(shell cd ../..; git ls-files | grep -v -e "^tests/" -e "^doc/" -e "^install/po/" -e "^ipapython/test/" -e "setup.py" -e "setup-client.py" | grep "\.py$$" | tr '\n' ' '; cd install/po)
+PY_FILES = $(shell cd ../..; git ls-files | grep -v -e "^ipatests/" -e "^doc/" -e "^install/po/" -e "^ipapython/test/" -e "setup.py" -e "setup-client.py" | grep "\.py$$" | tr '\n' ' '; cd install/po)
C_FILES = $(shell cd ../..; git ls-files | grep "\.c$$" | tr '\n' ' '; cd install/po)
H_FILES = $(shell cd ../..; git ls-files | grep "\.h$$" | tr '\n' ' '; cd install/po)
diff --git a/tests/__init__.py b/ipatests/__init__.py
index 3dc405f..3dc405f 100644
--- a/tests/__init__.py
+++ b/ipatests/__init__.py
diff --git a/tests/data.py b/ipatests/data.py
index 9332a53..9332a53 100644
--- a/tests/data.py
+++ b/ipatests/data.py
diff --git a/tests/i18n.py b/ipatests/i18n.py
index 9c8479b..9c8479b 100755
--- a/tests/i18n.py
+++ b/ipatests/i18n.py
diff --git a/ipatests/setup.py.in b/ipatests/setup.py.in
new file mode 100644
index 0000000..2517651
--- /dev/null
+++ b/ipatests/setup.py.in
@@ -0,0 +1,87 @@
+#!/usr/bin/python
+# Copyright (C) 2007 Red Hat
+# see file 'COPYING' for use and warranty information
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+
+"""FreeIPA tests
+
+FreeIPA is a server for identity, policy, and audit.
+"""
+
+DOCLINES = __doc__.split("\n")
+
+import os
+import sys
+import distutils.sysconfig
+
+CLASSIFIERS = """\
+Development Status :: 4 - Beta
+Intended Audience :: System Environment/Base
+License :: GPL
+Programming Language :: Python
+Operating System :: POSIX
+Operating System :: Unix
+"""
+
+# BEFORE importing distutils, remove MANIFEST. distutils doesn't properly
+# update it when the contents of directories change.
+if os.path.exists('MANIFEST'):
+ os.remove('MANIFEST')
+
+def setup_package():
+
+ from distutils.core import setup
+
+ old_path = os.getcwd()
+ local_path = os.path.dirname(os.path.abspath(sys.argv[0]))
+ os.chdir(local_path)
+ sys.path.insert(0, local_path)
+
+ try:
+ setup(
+ name = "ipatests",
+ version = "__VERSION__",
+ license = "GPL",
+ author = "FreeIPA Developers",
+ author_email = "freeipa-devel@redhat.com",
+ maintainer = "FreeIPA Developers",
+ maintainer_email = "freeipa-devel@redhat.com",
+ url = "http://www.freeipa.org/",
+ description = DOCLINES[0],
+ long_description = "\n".join(DOCLINES[2:]),
+ download_url = "http://www.freeipa.org/page/Downloads",
+ classifiers=filter(None, CLASSIFIERS.split('\n')),
+ package_dir = {'ipatests': ''},
+ packages = ["ipatests",
+ "ipatests.test_cmdline",
+ "ipatests.test_install",
+ "ipatests.test_ipalib",
+ "ipatests.test_ipapython",
+ "ipatests.test_ipaserver",
+ "ipatests.test_ipaserver.install",
+ "ipatests.test_pkcs10",
+ "ipatests.test_xmlrpc"],
+ package_data = {
+ 'ipatests.test_install': ['*.update'],
+ 'ipatests.test_pkcs10': ['*.csr']}
+ )
+ finally:
+ del sys.path[0]
+ os.chdir(old_path)
+ return
+
+if __name__ == '__main__':
+ setup_package()
diff --git a/tests/test_cmdline/cmdline.py b/ipatests/test_cmdline/cmdline.py
index d86652b..6f3541d 100644
--- a/tests/test_cmdline/cmdline.py
+++ b/ipatests/test_cmdline/cmdline.py
@@ -26,7 +26,7 @@ import krbV
from ipalib import api
from ipalib import errors
-from tests.test_xmlrpc.xmlrpc_test import XMLRPC_test
+from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test
from ipaserver.plugins.ldap2 import ldap2
from ipapython import ipautil
diff --git a/tests/test_cmdline/test_cli.py b/ipatests/test_cmdline/test_cli.py
index bd1281e..fe411b7 100644
--- a/tests/test_cmdline/test_cli.py
+++ b/ipatests/test_cmdline/test_cli.py
@@ -5,7 +5,7 @@ import StringIO
import nose
-from tests import util
+from ipatests import util
from ipalib import api, errors
from ipapython.version import API_VERSION
diff --git a/tests/test_cmdline/test_help.py b/ipatests/test_cmdline/test_help.py
index 4cf6336..4cf6336 100644
--- a/tests/test_cmdline/test_help.py
+++ b/ipatests/test_cmdline/test_help.py
diff --git a/tests/test_cmdline/test_ipagetkeytab.py b/ipatests/test_cmdline/test_ipagetkeytab.py
index cb46fd2..cb46fd2 100644
--- a/tests/test_cmdline/test_ipagetkeytab.py
+++ b/ipatests/test_cmdline/test_ipagetkeytab.py
diff --git a/tests/test_install/0_reset.update b/ipatests/test_install/0_reset.update
index bd6ee63..bd6ee63 100644
--- a/tests/test_install/0_reset.update
+++ b/ipatests/test_install/0_reset.update
diff --git a/tests/test_install/1_add.update b/ipatests/test_install/1_add.update
index 2543a71..2543a71 100644
--- a/tests/test_install/1_add.update
+++ b/ipatests/test_install/1_add.update
diff --git a/tests/test_install/2_update.update b/ipatests/test_install/2_update.update
index 0d4d38e..0d4d38e 100644
--- a/tests/test_install/2_update.update
+++ b/ipatests/test_install/2_update.update
diff --git a/tests/test_install/3_update.update b/ipatests/test_install/3_update.update
index c938b43..c938b43 100644
--- a/tests/test_install/3_update.update
+++ b/ipatests/test_install/3_update.update
diff --git a/tests/test_install/4_update.update b/ipatests/test_install/4_update.update
index 0aef749..0aef749 100644
--- a/tests/test_install/4_update.update
+++ b/ipatests/test_install/4_update.update
diff --git a/tests/test_install/5_update.update b/ipatests/test_install/5_update.update
index b0a7190..b0a7190 100644
--- a/tests/test_install/5_update.update
+++ b/ipatests/test_install/5_update.update
diff --git a/tests/test_install/6_update.update b/ipatests/test_install/6_update.update
index d398c1d..d398c1d 100644
--- a/tests/test_install/6_update.update
+++ b/ipatests/test_install/6_update.update
diff --git a/tests/test_install/8_badsyntax.update b/ipatests/test_install/8_badsyntax.update
index 1e87896..1e87896 100644
--- a/tests/test_install/8_badsyntax.update
+++ b/ipatests/test_install/8_badsyntax.update
diff --git a/tests/test_install/9_badsyntax.update b/ipatests/test_install/9_badsyntax.update
index fd6d458..fd6d458 100644
--- a/tests/test_install/9_badsyntax.update
+++ b/ipatests/test_install/9_badsyntax.update
diff --git a/tests/test_install/__init__.py b/ipatests/test_install/__init__.py
index 0ca31f1..0ca31f1 100644
--- a/tests/test_install/__init__.py
+++ b/ipatests/test_install/__init__.py
diff --git a/tests/test_install/test_updates.py b/ipatests/test_install/test_updates.py
index b974aa3..c25d74a 100644
--- a/tests/test_install/test_updates.py
+++ b/ipatests/test_install/test_updates.py
@@ -63,8 +63,8 @@ class test_update(unittest.TestCase):
self.ld.do_simple_bind(bindpw=self.dm_password)
if ipautil.file_exists("0_reset.update"):
self.testdir="./"
- elif ipautil.file_exists("tests/test_install/0_reset.update"):
- self.testdir= "./tests/test_install/"
+ elif ipautil.file_exists("ipatests/test_install/0_reset.update"):
+ self.testdir= "./ipatests/test_install/"
else:
raise nose.SkipTest("Unable to find test update files")
diff --git a/tests/test_ipalib/__init__.py b/ipatests/test_ipalib/__init__.py
index 4e4c605..4e4c605 100644
--- a/tests/test_ipalib/__init__.py
+++ b/ipatests/test_ipalib/__init__.py
diff --git a/tests/test_ipalib/test_backend.py b/ipatests/test_ipalib/test_backend.py
index e18c8d3..3ebed4b 100644
--- a/tests/test_ipalib/test_backend.py
+++ b/ipatests/test_ipalib/test_backend.py
@@ -22,8 +22,8 @@ Test the `ipalib.backend` module.
"""
import threading
-from tests.util import ClassChecker, raises, create_test_api
-from tests.data import unicode_str
+from ipatests.util import ClassChecker, raises, create_test_api
+from ipatests.data import unicode_str
from ipalib.request import context, Connection
from ipalib.frontend import Command
from ipalib import backend, plugable, errors, base
diff --git a/tests/test_ipalib/test_base.py b/ipatests/test_ipalib/test_base.py
index 78c8be0..ef6c180 100644
--- a/tests/test_ipalib/test_base.py
+++ b/ipatests/test_ipalib/test_base.py
@@ -21,7 +21,7 @@
Test the `ipalib.base` module.
"""
-from tests.util import ClassChecker, raises
+from ipatests.util import ClassChecker, raises
from ipalib.constants import NAME_REGEX, NAME_ERROR
from ipalib.constants import TYPE_ERROR, SET_ERROR, DEL_ERROR, OVERRIDE_ERROR
from ipalib import base
diff --git a/tests/test_ipalib/test_capabilities.py b/ipatests/test_ipalib/test_capabilities.py
index 21e53c2..21e53c2 100644
--- a/tests/test_ipalib/test_capabilities.py
+++ b/ipatests/test_ipalib/test_capabilities.py
diff --git a/tests/test_ipalib/test_cli.py b/ipatests/test_ipalib/test_cli.py
index 0a6eeee..07935c5 100644
--- a/tests/test_ipalib/test_cli.py
+++ b/ipatests/test_ipalib/test_cli.py
@@ -21,7 +21,7 @@
Test the `ipalib.cli` module.
"""
-from tests.util import raises, get_api, ClassChecker
+from ipatests.util import raises, get_api, ClassChecker
from ipalib import cli, plugable, frontend, backend
diff --git a/tests/test_ipalib/test_config.py b/ipatests/test_ipalib/test_config.py
index e729a62..f896b89 100644
--- a/tests/test_ipalib/test_config.py
+++ b/ipatests/test_ipalib/test_config.py
@@ -26,9 +26,9 @@ import os
from os import path
import sys
import socket
-from tests.util import raises, setitem, delitem, ClassChecker
-from tests.util import getitem, setitem, delitem
-from tests.util import TempDir, TempHome
+from ipatests.util import raises, setitem, delitem, ClassChecker
+from ipatests.util import getitem, setitem, delitem
+from ipatests.util import TempDir, TempHome
from ipalib.constants import TYPE_ERROR, OVERRIDE_ERROR, SET_ERROR, DEL_ERROR
from ipalib.constants import NAME_REGEX, NAME_ERROR
from ipalib import config, constants, base
diff --git a/tests/test_ipalib/test_crud.py b/ipatests/test_ipalib/test_crud.py
index b19605b..602f99f 100644
--- a/tests/test_ipalib/test_crud.py
+++ b/ipatests/test_ipalib/test_crud.py
@@ -21,7 +21,7 @@
Test the `ipalib.crud` module.
"""
-from tests.util import read_only, raises, get_api, ClassChecker
+from ipatests.util import read_only, raises, get_api, ClassChecker
from ipalib import crud, frontend, plugable, config
from ipalib.parameters import Str
diff --git a/tests/test_ipalib/test_errors.py b/ipatests/test_ipalib/test_errors.py
index 49bed71..258af3b 100644
--- a/tests/test_ipalib/test_errors.py
+++ b/ipatests/test_ipalib/test_errors.py
@@ -24,7 +24,7 @@ Test the `ipalib.errors` module.
import re
import inspect
-from tests.util import assert_equal, raises
+from ipatests.util import assert_equal, raises
from ipalib import errors, text
from ipalib.constants import TYPE_ERROR
diff --git a/tests/test_ipalib/test_frontend.py b/ipatests/test_ipalib/test_frontend.py
index 3a54060..310d7a5 100644
--- a/tests/test_ipalib/test_frontend.py
+++ b/ipatests/test_ipalib/test_frontend.py
@@ -21,9 +21,9 @@
Test the `ipalib.frontend` module.
"""
-from tests.util import raises, getitem, no_set, no_del, read_only
-from tests.util import check_TypeError, ClassChecker, create_test_api
-from tests.util import assert_equal
+from ipatests.util import raises, getitem, no_set, no_del, read_only
+from ipatests.util import check_TypeError, ClassChecker, create_test_api
+from ipatests.util import assert_equal
from ipalib.constants import TYPE_ERROR
from ipalib.base import NameSpace
from ipalib import frontend, backend, plugable, errors, parameters, config
diff --git a/tests/test_ipalib/test_messages.py b/ipatests/test_ipalib/test_messages.py
index ebc400e..686bf8d 100644
--- a/tests/test_ipalib/test_messages.py
+++ b/ipatests/test_ipalib/test_messages.py
@@ -23,7 +23,7 @@ Test the `ipalib.messages` module.
from ipalib import messages
from ipalib.capabilities import capabilities
-from tests.test_ipalib import test_errors
+from ipatests.test_ipalib import test_errors
class HelloMessage(messages.PublicMessage):
diff --git a/tests/test_ipalib/test_output.py b/ipatests/test_ipalib/test_output.py
index 741b836..15ef11e 100644
--- a/tests/test_ipalib/test_output.py
+++ b/ipatests/test_ipalib/test_output.py
@@ -21,7 +21,7 @@
Test the `ipalib.output` module.
"""
-from tests.util import raises, ClassChecker
+from ipatests.util import raises, ClassChecker
from ipalib import output
from ipalib.frontend import Command
from ipalib import _
diff --git a/tests/test_ipalib/test_parameters.py b/ipatests/test_ipalib/test_parameters.py
index 192db3d..71acfce 100644
--- a/tests/test_ipalib/test_parameters.py
+++ b/ipatests/test_ipalib/test_parameters.py
@@ -27,9 +27,9 @@ import sys
from types import NoneType
from decimal import Decimal
from inspect import isclass
-from tests.util import raises, ClassChecker, read_only
-from tests.util import dummy_ugettext, assert_equal
-from tests.data import binary_bytes, utf8_bytes, unicode_str
+from ipatests.util import raises, ClassChecker, read_only
+from ipatests.util import dummy_ugettext, assert_equal
+from ipatests.data import binary_bytes, utf8_bytes, unicode_str
from ipalib import parameters, text, errors, config
from ipalib.constants import TYPE_ERROR, CALLABLE_ERROR, NULLS
from ipalib.errors import ValidationError, ConversionError
diff --git a/tests/test_ipalib/test_plugable.py b/ipatests/test_ipalib/test_plugable.py
index 3355e05..c495e74 100644
--- a/tests/test_ipalib/test_plugable.py
+++ b/ipatests/test_ipalib/test_plugable.py
@@ -22,9 +22,9 @@ Test the `ipalib.plugable` module.
"""
import inspect
-from tests.util import raises, no_set, no_del, read_only
-from tests.util import getitem, setitem, delitem
-from tests.util import ClassChecker, create_test_api
+from ipatests.util import raises, no_set, no_del, read_only
+from ipatests.util import getitem, setitem, delitem
+from ipatests.util import ClassChecker, create_test_api
from ipalib import plugable, errors, text
@@ -247,7 +247,7 @@ class test_Plugin(ClassChecker):
info = 'whatever'
e = raises(StandardError, check)
assert str(e) == \
- "info is already bound to tests.test_ipalib.test_plugable.check()"
+ "info is already bound to ipatests.test_ipalib.test_plugable.check()"
def test_set_api(self):
"""
diff --git a/tests/test_ipalib/test_rpc.py b/ipatests/test_ipalib/test_rpc.py
index f8f078d..56b8184 100644
--- a/tests/test_ipalib/test_rpc.py
+++ b/ipatests/test_ipalib/test_rpc.py
@@ -23,8 +23,8 @@ Test the `ipalib.rpc` module.
import threading
from xmlrpclib import Binary, Fault, dumps, loads, ServerProxy
-from tests.util import raises, assert_equal, PluginTester, DummyClass
-from tests.data import binary_bytes, utf8_bytes, unicode_str
+from ipatests.util import raises, assert_equal, PluginTester, DummyClass
+from ipatests.data import binary_bytes, utf8_bytes, unicode_str
from ipalib.frontend import Command
from ipalib.request import context, Connection
from ipalib import rpc, errors
diff --git a/tests/test_ipalib/test_text.py b/ipatests/test_ipalib/test_text.py
index 9f60785..2a5ff7a 100644
--- a/tests/test_ipalib/test_text.py
+++ b/ipatests/test_ipalib/test_text.py
@@ -27,8 +27,8 @@ import tempfile
import re
import nose
import locale
-from tests.util import raises, assert_equal
-from tests.i18n import create_po, po_file_iterate
+from ipatests.util import raises, assert_equal
+from ipatests.i18n import create_po, po_file_iterate
from ipalib.request import context
from ipalib import request
from ipalib import text
diff --git a/tests/test_ipalib/test_util.py b/ipatests/test_ipalib/test_util.py
index 9d19dfb..9d19dfb 100644
--- a/tests/test_ipalib/test_util.py
+++ b/ipatests/test_ipalib/test_util.py
diff --git a/tests/test_ipalib/test_x509.py b/ipatests/test_ipalib/test_x509.py
index cf07631..c7fafbb 100644
--- a/tests/test_ipalib/test_x509.py
+++ b/ipatests/test_ipalib/test_x509.py
@@ -24,9 +24,9 @@ Test the `ipalib.x509` module.
import os
from os import path
import sys
-from tests.util import raises, setitem, delitem, ClassChecker
-from tests.util import getitem, setitem, delitem
-from tests.util import TempDir, TempHome
+from ipatests.util import raises, setitem, delitem, ClassChecker
+from ipatests.util import getitem, setitem, delitem
+from ipatests.util import TempDir, TempHome
from ipalib.constants import TYPE_ERROR, OVERRIDE_ERROR, SET_ERROR, DEL_ERROR
from ipalib.constants import NAME_REGEX, NAME_ERROR
import base64
diff --git a/tests/test_ipapython/__init__.py b/ipatests/test_ipapython/__init__.py
index fa0e44b..fa0e44b 100644
--- a/tests/test_ipapython/__init__.py
+++ b/ipatests/test_ipapython/__init__.py
diff --git a/tests/test_ipapython/test_cookie.py b/ipatests/test_ipapython/test_cookie.py
index b8a2d36..b8a2d36 100644
--- a/tests/test_ipapython/test_cookie.py
+++ b/ipatests/test_ipapython/test_cookie.py
diff --git a/tests/test_ipapython/test_dn.py b/ipatests/test_ipapython/test_dn.py
index cdeab93..cdeab93 100644
--- a/tests/test_ipapython/test_dn.py
+++ b/ipatests/test_ipapython/test_dn.py
diff --git a/tests/test_ipapython/test_ipautil.py b/ipatests/test_ipapython/test_ipautil.py
index 650e1ce..650e1ce 100644
--- a/tests/test_ipapython/test_ipautil.py
+++ b/ipatests/test_ipapython/test_ipautil.py
diff --git a/tests/test_ipapython/test_keyring.py b/ipatests/test_ipapython/test_keyring.py
index 568fd5e..568fd5e 100644
--- a/tests/test_ipapython/test_keyring.py
+++ b/ipatests/test_ipapython/test_keyring.py
diff --git a/tests/test_ipapython/test_ssh.py b/ipatests/test_ipapython/test_ssh.py
index 2640af5..2640af5 100644
--- a/tests/test_ipapython/test_ssh.py
+++ b/ipatests/test_ipapython/test_ssh.py
diff --git a/tests/test_ipaserver/__init__.py b/ipatests/test_ipaserver/__init__.py
index 2192cc2..2192cc2 100644
--- a/tests/test_ipaserver/__init__.py
+++ b/ipatests/test_ipaserver/__init__.py
diff --git a/tests/test_ipaserver/httptest.py b/ipatests/test_ipaserver/httptest.py
index 7f1b5b1..7f1b5b1 100644
--- a/tests/test_ipaserver/httptest.py
+++ b/ipatests/test_ipaserver/httptest.py
diff --git a/tests/test_ipaserver/install/test_adtrustinstance.py b/ipatests/test_ipaserver/install/test_adtrustinstance.py
index 9a62f87..9a62f87 100755
--- a/tests/test_ipaserver/install/test_adtrustinstance.py
+++ b/ipatests/test_ipaserver/install/test_adtrustinstance.py
diff --git a/tests/test_ipaserver/test_changepw.py b/ipatests/test_ipaserver/test_changepw.py
index 4491e0b..040c9cd 100644
--- a/tests/test_ipaserver/test_changepw.py
+++ b/ipatests/test_ipaserver/test_changepw.py
@@ -20,8 +20,8 @@
import nose
from httptest import Unauthorized_HTTP_test
-from tests.test_xmlrpc.xmlrpc_test import XMLRPC_test
-from tests.util import assert_equal, assert_not_equal
+from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test
+from ipatests.util import assert_equal, assert_not_equal
from ipalib import api, errors
from ipapython.dn import DN
import ldap
diff --git a/tests/test_ipaserver/test_ldap.py b/ipatests/test_ipaserver/test_ldap.py
index 21363f2..21363f2 100644
--- a/tests/test_ipaserver/test_ldap.py
+++ b/ipatests/test_ipaserver/test_ldap.py
diff --git a/tests/test_ipaserver/test_rpcserver.py b/ipatests/test_ipaserver/test_rpcserver.py
index a75a85e..bd56738 100644
--- a/tests/test_ipaserver/test_rpcserver.py
+++ b/ipatests/test_ipaserver/test_rpcserver.py
@@ -23,8 +23,8 @@ Test the `ipaserver.rpc` module.
import json
-from tests.util import create_test_api, assert_equal, raises, PluginTester
-from tests.data import unicode_str
+from ipatests.util import create_test_api, assert_equal, raises, PluginTester
+from ipatests.data import unicode_str
from ipalib import errors, Command
from ipaserver import rpcserver
diff --git a/tests/test_pkcs10/__init__.py b/ipatests/test_pkcs10/__init__.py
index cd03658..cd03658 100644
--- a/tests/test_pkcs10/__init__.py
+++ b/ipatests/test_pkcs10/__init__.py
diff --git a/tests/test_pkcs10/test0.csr b/ipatests/test_pkcs10/test0.csr
index eadfb70..eadfb70 100644
--- a/tests/test_pkcs10/test0.csr
+++ b/ipatests/test_pkcs10/test0.csr
diff --git a/tests/test_pkcs10/test1.csr b/ipatests/test_pkcs10/test1.csr
index 0dad3ae..0dad3ae 100644
--- a/tests/test_pkcs10/test1.csr
+++ b/ipatests/test_pkcs10/test1.csr
diff --git a/tests/test_pkcs10/test2.csr b/ipatests/test_pkcs10/test2.csr
index ccc47f8..ccc47f8 100644
--- a/tests/test_pkcs10/test2.csr
+++ b/ipatests/test_pkcs10/test2.csr
diff --git a/tests/test_pkcs10/test3.csr b/ipatests/test_pkcs10/test3.csr
index 82c84d1..82c84d1 100644
--- a/tests/test_pkcs10/test3.csr
+++ b/ipatests/test_pkcs10/test3.csr
diff --git a/tests/test_pkcs10/test4.csr b/ipatests/test_pkcs10/test4.csr
index 9f08b80..9f08b80 100644
--- a/tests/test_pkcs10/test4.csr
+++ b/ipatests/test_pkcs10/test4.csr
diff --git a/tests/test_pkcs10/test5.csr b/ipatests/test_pkcs10/test5.csr
index 41c3c1f..41c3c1f 100644
--- a/tests/test_pkcs10/test5.csr
+++ b/ipatests/test_pkcs10/test5.csr
diff --git a/tests/test_pkcs10/test_pkcs10.py b/ipatests/test_pkcs10/test_pkcs10.py
index 381bf9e..6b3534b 100644
--- a/tests/test_pkcs10/test_pkcs10.py
+++ b/ipatests/test_pkcs10/test_pkcs10.py
@@ -23,7 +23,7 @@ Test the `pkcs10.py` module.
import os
import sys
import nose
-from tests.util import raises, PluginTester
+from ipatests.util import raises, PluginTester
from ipalib import pkcs10
from ipapython import ipautil
import nss.nss as nss
@@ -38,8 +38,8 @@ class test_update(object):
nss.nss_init_nodb()
if ipautil.file_exists("test0.csr"):
self.testdir="./"
- elif ipautil.file_exists("tests/test_pkcs10/test0.csr"):
- self.testdir= "./tests/test_pkcs10/"
+ elif ipautil.file_exists("ipatests/test_pkcs10/test0.csr"):
+ self.testdir= "./ipatests/test_pkcs10/"
else:
raise nose.SkipTest("Unable to find test update files")
diff --git a/tests/test_util.py b/ipatests/test_util.py
index f87822a..f87822a 100644
--- a/tests/test_util.py
+++ b/ipatests/test_util.py
diff --git a/tests/test_xmlrpc/__init__.py b/ipatests/test_xmlrpc/__init__.py
index 1a8ecf1..1a8ecf1 100644
--- a/tests/test_xmlrpc/__init__.py
+++ b/ipatests/test_xmlrpc/__init__.py
diff --git a/tests/test_xmlrpc/objectclasses.py b/ipatests/test_xmlrpc/objectclasses.py
index 75ac3eb..75ac3eb 100644
--- a/tests/test_xmlrpc/objectclasses.py
+++ b/ipatests/test_xmlrpc/objectclasses.py
diff --git a/tests/test_xmlrpc/test_attr.py b/ipatests/test_xmlrpc/test_attr.py
index 050ea08..ef5b882 100644
--- a/tests/test_xmlrpc/test_attr.py
+++ b/ipatests/test_xmlrpc/test_attr.py
@@ -22,7 +22,7 @@ Test --setattr and --addattr and other attribute-specific issues
"""
from ipalib import api, errors
-from tests.test_xmlrpc import objectclasses
+from ipatests.test_xmlrpc import objectclasses
from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
from ipapython.dn import DN
diff --git a/tests/test_xmlrpc/test_automember_plugin.py b/ipatests/test_xmlrpc/test_automember_plugin.py
index fdf3c73..a50860e 100644
--- a/tests/test_xmlrpc/test_automember_plugin.py
+++ b/ipatests/test_xmlrpc/test_automember_plugin.py
@@ -23,7 +23,7 @@ Test the `ipalib/plugins/automember.py` module.
from ipalib import api, errors
from ipapython.dn import DN
-from tests.test_xmlrpc import objectclasses
+from ipatests.test_xmlrpc import objectclasses
from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
diff --git a/tests/test_xmlrpc/test_automount_plugin.py b/ipatests/test_xmlrpc/test_automount_plugin.py
index 19968a0..e1af651 100644
--- a/tests/test_xmlrpc/test_automount_plugin.py
+++ b/ipatests/test_xmlrpc/test_automount_plugin.py
@@ -32,7 +32,7 @@ from ipapython.dn import DN
from nose.tools import raises, assert_raises # pylint: disable=E0611
from xmlrpc_test import XMLRPC_test, assert_attr_equal
-from tests.util import assert_deepequal
+from ipatests.util import assert_deepequal
class MockTextui(list):
diff --git a/tests/test_xmlrpc/test_baseldap_plugin.py b/ipatests/test_xmlrpc/test_baseldap_plugin.py
index 6a8501f..6a8501f 100644
--- a/tests/test_xmlrpc/test_baseldap_plugin.py
+++ b/ipatests/test_xmlrpc/test_baseldap_plugin.py
diff --git a/tests/test_xmlrpc/test_batch_plugin.py b/ipatests/test_xmlrpc/test_batch_plugin.py
index 55e5570..2b056c9 100644
--- a/tests/test_xmlrpc/test_batch_plugin.py
+++ b/ipatests/test_xmlrpc/test_batch_plugin.py
@@ -22,8 +22,8 @@ Test the `ipalib/plugins/batch.py` module.
"""
from ipalib import api, errors
-from tests.test_xmlrpc import objectclasses
-from tests.util import assert_equal, Fuzzy, assert_deepequal
+from ipatests.test_xmlrpc import objectclasses
+from ipatests.util import assert_equal, Fuzzy, assert_deepequal
from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
from ipapython.dn import DN
diff --git a/tests/test_xmlrpc/test_cert_plugin.py b/ipatests/test_xmlrpc/test_cert_plugin.py
index 508e914..508e914 100644
--- a/tests/test_xmlrpc/test_cert_plugin.py
+++ b/ipatests/test_xmlrpc/test_cert_plugin.py
diff --git a/tests/test_xmlrpc/test_config_plugin.py b/ipatests/test_xmlrpc/test_config_plugin.py
index 3d9a31d..3d9a31d 100644
--- a/tests/test_xmlrpc/test_config_plugin.py
+++ b/ipatests/test_xmlrpc/test_config_plugin.py
diff --git a/tests/test_xmlrpc/test_delegation_plugin.py b/ipatests/test_xmlrpc/test_delegation_plugin.py
index bc3b96a..f2cfc83 100644
--- a/tests/test_xmlrpc/test_delegation_plugin.py
+++ b/ipatests/test_xmlrpc/test_delegation_plugin.py
@@ -22,7 +22,7 @@ Test the `ipalib/plugins/delegation.py` module.
"""
from ipalib import api, errors
-from tests.test_xmlrpc import objectclasses
+from ipatests.test_xmlrpc import objectclasses
from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
from ipapython.dn import DN
diff --git a/tests/test_xmlrpc/test_dns_plugin.py b/ipatests/test_xmlrpc/test_dns_plugin.py
index 0d78f80..ea9b70e 100644
--- a/tests/test_xmlrpc/test_dns_plugin.py
+++ b/ipatests/test_xmlrpc/test_dns_plugin.py
@@ -23,7 +23,7 @@ Test the `ipalib/plugins/dns.py` module.
import nose
from ipalib import api, errors
from ipapython.dn import DN
-from tests.test_xmlrpc import objectclasses
+from ipatests.test_xmlrpc import objectclasses
from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
dnszone1 = u'dnszone.test'
diff --git a/tests/test_xmlrpc/test_dns_realmdomains_integration.py b/ipatests/test_xmlrpc/test_dns_realmdomains_integration.py
index c4660a5..1e46d36 100644
--- a/tests/test_xmlrpc/test_dns_realmdomains_integration.py
+++ b/ipatests/test_xmlrpc/test_dns_realmdomains_integration.py
@@ -24,7 +24,7 @@ Test integration of DNS and realmdomains.
from ipalib import api, errors
from ipapython.dn import DN
-from tests.test_xmlrpc import objectclasses
+from ipatests.test_xmlrpc import objectclasses
from xmlrpc_test import Declarative, fuzzy_digits
diff --git a/tests/test_xmlrpc/test_external_members.py b/ipatests/test_xmlrpc/test_external_members.py
index 6f9949f..112470d 100644
--- a/tests/test_xmlrpc/test_external_members.py
+++ b/ipatests/test_xmlrpc/test_external_members.py
@@ -24,7 +24,7 @@ These tests are skipped if trust is not established.
import nose
from ipalib import api
from ipapython.dn import DN
-from tests.test_xmlrpc import objectclasses
+from ipatests.test_xmlrpc import objectclasses
from xmlrpc_test import Declarative, fuzzy_uuid, fuzzy_user_or_group_sid
group_name = u'external_group'
diff --git a/tests/test_xmlrpc/test_group_plugin.py b/ipatests/test_xmlrpc/test_group_plugin.py
index 7a9b8b6..1d0cfeb 100644
--- a/tests/test_xmlrpc/test_group_plugin.py
+++ b/ipatests/test_xmlrpc/test_group_plugin.py
@@ -22,8 +22,8 @@ Test the `ipalib/plugins/group.py` module.
"""
from ipalib import api, errors
-from tests.test_xmlrpc import objectclasses
-from tests.util import Fuzzy
+from ipatests.test_xmlrpc import objectclasses
+from ipatests.util import Fuzzy
from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid, fuzzy_set_ci
from ipapython.dn import DN
diff --git a/tests/test_xmlrpc/test_hbac_plugin.py b/ipatests/test_xmlrpc/test_hbac_plugin.py
index c0f8b53..c0f8b53 100644
--- a/tests/test_xmlrpc/test_hbac_plugin.py
+++ b/ipatests/test_xmlrpc/test_hbac_plugin.py
diff --git a/tests/test_xmlrpc/test_hbacsvcgroup_plugin.py b/ipatests/test_xmlrpc/test_hbacsvcgroup_plugin.py
index 591c8a9..8140741 100644
--- a/tests/test_xmlrpc/test_hbacsvcgroup_plugin.py
+++ b/ipatests/test_xmlrpc/test_hbacsvcgroup_plugin.py
@@ -22,8 +22,8 @@ Test the `ipalib.plugins.hbacsvcgroup` module.
"""
from ipalib import api, errors
-from tests.test_xmlrpc.xmlrpc_test import Declarative, fuzzy_uuid
-from tests.test_xmlrpc import objectclasses
+from ipatests.test_xmlrpc.xmlrpc_test import Declarative, fuzzy_uuid
+from ipatests.test_xmlrpc import objectclasses
from ipapython.dn import DN
hbacsvcgroup1 = u'testhbacsvcgroup1'
diff --git a/tests/test_xmlrpc/test_hbactest_plugin.py b/ipatests/test_xmlrpc/test_hbactest_plugin.py
index 520f202..520f202 100644
--- a/tests/test_xmlrpc/test_hbactest_plugin.py
+++ b/ipatests/test_xmlrpc/test_hbactest_plugin.py
diff --git a/tests/test_xmlrpc/test_host_plugin.py b/ipatests/test_xmlrpc/test_host_plugin.py
index 07faf77..a23a341 100644
--- a/tests/test_xmlrpc/test_host_plugin.py
+++ b/ipatests/test_xmlrpc/test_host_plugin.py
@@ -29,10 +29,10 @@ from ipalib import api, errors, x509
from ipapython.dn import DN
from nose.tools import raises, assert_raises
from nose.plugins.skip import Skip, SkipTest
-from tests.test_xmlrpc.xmlrpc_test import (Declarative, XMLRPC_test,
+from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, XMLRPC_test,
fuzzy_uuid, fuzzy_digits, fuzzy_hash, fuzzy_date, fuzzy_issuer,
fuzzy_hex)
-from tests.test_xmlrpc import objectclasses
+from ipatests.test_xmlrpc import objectclasses
import base64
@@ -56,7 +56,7 @@ dn4 = DN(('fqdn',fqdn4),('cn','computers'),('cn','accounts'),
invalidfqdn1 = u'foo_bar.lab.%s' % api.env.domain
# We can use the same cert we generated for the service tests
-fd = open('tests/test_xmlrpc/service.crt', 'r')
+fd = open('ipatests/test_xmlrpc/service.crt', 'r')
servercert = fd.readlines()
servercert = ''.join(servercert)
servercert = x509.strip_header(servercert)
diff --git a/tests/test_xmlrpc/test_hostgroup_plugin.py b/ipatests/test_xmlrpc/test_hostgroup_plugin.py
index 36c497b..b610979 100644
--- a/tests/test_xmlrpc/test_hostgroup_plugin.py
+++ b/ipatests/test_xmlrpc/test_hostgroup_plugin.py
@@ -23,8 +23,8 @@ Test the `ipalib.plugins.hostgroup` module.
"""
from ipalib import api, errors
-from tests.test_xmlrpc.xmlrpc_test import Declarative, fuzzy_uuid
-from tests.test_xmlrpc import objectclasses
+from ipatests.test_xmlrpc.xmlrpc_test import Declarative, fuzzy_uuid
+from ipatests.test_xmlrpc import objectclasses
from ipapython.dn import DN
hostgroup1 = u'testhostgroup1'
diff --git a/tests/test_xmlrpc/test_krbtpolicy.py b/ipatests/test_xmlrpc/test_krbtpolicy.py
index c61e754..b940c5e 100644
--- a/tests/test_xmlrpc/test_krbtpolicy.py
+++ b/ipatests/test_xmlrpc/test_krbtpolicy.py
@@ -21,7 +21,7 @@ Test kerberos ticket policy
"""
from ipalib import api, errors
-from tests.test_xmlrpc import objectclasses
+from ipatests.test_xmlrpc import objectclasses
from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
from ipapython.dn import DN
diff --git a/tests/test_xmlrpc/test_nesting.py b/ipatests/test_xmlrpc/test_nesting.py
index e1b41b2..5c093c9 100644
--- a/tests/test_xmlrpc/test_nesting.py
+++ b/ipatests/test_xmlrpc/test_nesting.py
@@ -21,7 +21,7 @@ Test group nexting an indirect members
"""
from ipalib import api, errors
-from tests.test_xmlrpc import objectclasses
+from ipatests.test_xmlrpc import objectclasses
from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
from ipapython.dn import DN
diff --git a/tests/test_xmlrpc/test_netgroup_plugin.py b/ipatests/test_xmlrpc/test_netgroup_plugin.py
index ee826b7..3dccac1 100644
--- a/tests/test_xmlrpc/test_netgroup_plugin.py
+++ b/ipatests/test_xmlrpc/test_netgroup_plugin.py
@@ -26,8 +26,9 @@ import krbV
from ipalib import api
from ipalib import errors
from ipaserver.plugins.ldap2 import ldap2
-from tests.test_xmlrpc.xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid, fuzzy_netgroupdn
-from tests.test_xmlrpc import objectclasses
+from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
+ fuzzy_uuid, fuzzy_netgroupdn)
+from ipatests.test_xmlrpc import objectclasses
from ipapython.dn import DN
# Global so we can save the value between tests
diff --git a/tests/test_xmlrpc/test_passwd_plugin.py b/ipatests/test_xmlrpc/test_passwd_plugin.py
index 2a44da7..2a44da7 100644
--- a/tests/test_xmlrpc/test_passwd_plugin.py
+++ b/ipatests/test_xmlrpc/test_passwd_plugin.py
diff --git a/tests/test_xmlrpc/test_permission_plugin.py b/ipatests/test_xmlrpc/test_permission_plugin.py
index 4a81f97..dbd9d69 100644
--- a/tests/test_xmlrpc/test_permission_plugin.py
+++ b/ipatests/test_xmlrpc/test_permission_plugin.py
@@ -23,7 +23,7 @@ Test the `ipalib/plugins/permission.py` module.
"""
from ipalib import api, errors
-from tests.test_xmlrpc import objectclasses
+from ipatests.test_xmlrpc import objectclasses
from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
from ipapython.dn import DN
diff --git a/tests/test_xmlrpc/test_ping_plugin.py b/ipatests/test_xmlrpc/test_ping_plugin.py
index 3673b43..1d40199 100644
--- a/tests/test_xmlrpc/test_ping_plugin.py
+++ b/ipatests/test_xmlrpc/test_ping_plugin.py
@@ -22,7 +22,7 @@ Test the `ipalib/plugins/ping.py` module, and XML-RPC in general.
"""
from ipalib import api, errors, messages, _
-from tests.util import Fuzzy
+from ipatests.util import Fuzzy
from xmlrpc_test import Declarative
from ipapython.version import API_VERSION
diff --git a/tests/test_xmlrpc/test_privilege_plugin.py b/ipatests/test_xmlrpc/test_privilege_plugin.py
index 81e51d5..741590d 100644
--- a/tests/test_xmlrpc/test_privilege_plugin.py
+++ b/ipatests/test_xmlrpc/test_privilege_plugin.py
@@ -22,7 +22,7 @@ Test the `ipalib/plugins/privilege.py` module.
"""
from ipalib import api, errors
-from tests.test_xmlrpc import objectclasses
+from ipatests.test_xmlrpc import objectclasses
from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
from ipapython.dn import DN
diff --git a/tests/test_xmlrpc/test_pwpolicy_plugin.py b/ipatests/test_xmlrpc/test_pwpolicy_plugin.py
index 3b482ce..3b482ce 100644
--- a/tests/test_xmlrpc/test_pwpolicy_plugin.py
+++ b/ipatests/test_xmlrpc/test_pwpolicy_plugin.py
diff --git a/tests/test_xmlrpc/test_range_plugin.py b/ipatests/test_xmlrpc/test_range_plugin.py
index ce70433..cbb700e 100644
--- a/tests/test_xmlrpc/test_range_plugin.py
+++ b/ipatests/test_xmlrpc/test_range_plugin.py
@@ -22,9 +22,9 @@ Test the `ipalib/plugins/idrange.py` module, and XML-RPC in general.
"""
from ipalib import api, errors, _
-from tests.util import assert_equal, Fuzzy
+from ipatests.util import assert_equal, Fuzzy
from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
-from tests.test_xmlrpc import objectclasses
+from ipatests.test_xmlrpc import objectclasses
from ipapython.dn import *
import ldap, ldap.sasl, ldap.modlist
diff --git a/tests/test_xmlrpc/test_realmdomains_plugin.py b/ipatests/test_xmlrpc/test_realmdomains_plugin.py
index 22cac22..8abb53e 100644
--- a/tests/test_xmlrpc/test_realmdomains_plugin.py
+++ b/ipatests/test_xmlrpc/test_realmdomains_plugin.py
@@ -22,7 +22,7 @@ Test the `ipalib/plugins/realmdomains.py` module.
from ipalib import api, errors
from ipapython.dn import DN
-from tests.test_xmlrpc import objectclasses
+from ipatests.test_xmlrpc import objectclasses
from xmlrpc_test import Declarative
diff --git a/tests/test_xmlrpc/test_replace.py b/ipatests/test_xmlrpc/test_replace.py
index 434f71d..281714b 100644
--- a/tests/test_xmlrpc/test_replace.py
+++ b/ipatests/test_xmlrpc/test_replace.py
@@ -26,7 +26,7 @@ gen_modlist code.
"""
from ipalib import api, errors
-from tests.test_xmlrpc import objectclasses
+from ipatests.test_xmlrpc import objectclasses
from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
from ipapython.dn import DN
diff --git a/tests/test_xmlrpc/test_role_plugin.py b/ipatests/test_xmlrpc/test_role_plugin.py
index be3fece..119bfb1 100644
--- a/tests/test_xmlrpc/test_role_plugin.py
+++ b/ipatests/test_xmlrpc/test_role_plugin.py
@@ -23,7 +23,7 @@ Test the `ipalib/plugins/role.py` module.
"""
from ipalib import api, errors
-from tests.test_xmlrpc import objectclasses
+from ipatests.test_xmlrpc import objectclasses
from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
from ipapython.dn import DN
diff --git a/tests/test_xmlrpc/test_selfservice_plugin.py b/ipatests/test_xmlrpc/test_selfservice_plugin.py
index fa67cbc..c78edbc 100644
--- a/tests/test_xmlrpc/test_selfservice_plugin.py
+++ b/ipatests/test_xmlrpc/test_selfservice_plugin.py
@@ -22,7 +22,7 @@ Test the `ipalib/plugins/selfservice.py` module.
"""
from ipalib import api, errors
-from tests.test_xmlrpc import objectclasses
+from ipatests.test_xmlrpc import objectclasses
from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
selfservice1 = u'testself'
diff --git a/tests/test_xmlrpc/test_selinuxusermap_plugin.py b/ipatests/test_xmlrpc/test_selinuxusermap_plugin.py
index ad3cb34..5bfe547 100644
--- a/tests/test_xmlrpc/test_selinuxusermap_plugin.py
+++ b/ipatests/test_xmlrpc/test_selinuxusermap_plugin.py
@@ -21,10 +21,10 @@ Test the `ipalib/plugins/selinuxusermap.py` module.
"""
from ipalib import api, errors
-from tests.test_xmlrpc import objectclasses
+from ipatests.test_xmlrpc import objectclasses
from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
from ipapython.dn import DN
-from tests.util import Fuzzy
+from ipatests.util import Fuzzy
rule1 = u'selinuxrule1'
selinuxuser1 = u'guest_u:s0'
diff --git a/tests/test_xmlrpc/test_service_plugin.py b/ipatests/test_xmlrpc/test_service_plugin.py
index 6f8dbbe..f51954e 100644
--- a/tests/test_xmlrpc/test_service_plugin.py
+++ b/ipatests/test_xmlrpc/test_service_plugin.py
@@ -22,10 +22,10 @@ Test the `ipalib/plugins/service.py` module.
"""
from ipalib import api, errors, x509
-from tests.test_xmlrpc.xmlrpc_test import Declarative, fuzzy_uuid, fuzzy_hash
-from tests.test_xmlrpc.xmlrpc_test import fuzzy_digits, fuzzy_date, fuzzy_issuer
-from tests.test_xmlrpc.xmlrpc_test import fuzzy_hex
-from tests.test_xmlrpc import objectclasses
+from ipatests.test_xmlrpc.xmlrpc_test import Declarative, fuzzy_uuid, fuzzy_hash
+from ipatests.test_xmlrpc.xmlrpc_test import fuzzy_digits, fuzzy_date, fuzzy_issuer
+from ipatests.test_xmlrpc.xmlrpc_test import fuzzy_hex
+from ipatests.test_xmlrpc import objectclasses
import base64
from ipapython.dn import DN
@@ -39,7 +39,7 @@ host1dn = DN(('fqdn',fqdn1),('cn','computers'),('cn','accounts'),api.env.basedn)
host2dn = DN(('fqdn',fqdn2),('cn','computers'),('cn','accounts'),api.env.basedn)
host3dn = DN(('fqdn',fqdn3),('cn','computers'),('cn','accounts'),api.env.basedn)
-fd = open('tests/test_xmlrpc/service.crt', 'r')
+fd = open('ipatests/test_xmlrpc/service.crt', 'r')
servercert = fd.readlines()
servercert = ''.join(servercert)
servercert = x509.strip_header(servercert)
diff --git a/tests/test_xmlrpc/test_sudocmd_plugin.py b/ipatests/test_xmlrpc/test_sudocmd_plugin.py
index 7b35507..fe91705 100644
--- a/tests/test_xmlrpc/test_sudocmd_plugin.py
+++ b/ipatests/test_xmlrpc/test_sudocmd_plugin.py
@@ -22,9 +22,9 @@ Test the `ipalib/plugins/sudocmd.py` module.
"""
from ipalib import errors
-from tests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_sudocmddn,
+from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_sudocmddn,
fuzzy_uuid)
-from tests.test_xmlrpc import objectclasses
+from ipatests.test_xmlrpc import objectclasses
sudocmd1 = u'/usr/bin/sudotestcmd1'
sudocmd1_camelcase = u'/usr/bin/sudoTestCmd1'
diff --git a/tests/test_xmlrpc/test_sudocmdgroup_plugin.py b/ipatests/test_xmlrpc/test_sudocmdgroup_plugin.py
index 7d688dc..397d476 100644
--- a/tests/test_xmlrpc/test_sudocmdgroup_plugin.py
+++ b/ipatests/test_xmlrpc/test_sudocmdgroup_plugin.py
@@ -21,7 +21,7 @@ Test the `ipalib/plugins/sudocmdgroup.py` module.
"""
from ipalib import api, errors
-from tests.test_xmlrpc import objectclasses
+from ipatests.test_xmlrpc import objectclasses
from xmlrpc_test import Declarative, fuzzy_uuid, fuzzy_sudocmddn
from ipapython.dn import DN
diff --git a/tests/test_xmlrpc/test_sudorule_plugin.py b/ipatests/test_xmlrpc/test_sudorule_plugin.py
index ec5d16d..ec5d16d 100644
--- a/tests/test_xmlrpc/test_sudorule_plugin.py
+++ b/ipatests/test_xmlrpc/test_sudorule_plugin.py
diff --git a/tests/test_xmlrpc/test_trust_plugin.py b/ipatests/test_xmlrpc/test_trust_plugin.py
index 7627be7..0223e8b 100644
--- a/tests/test_xmlrpc/test_trust_plugin.py
+++ b/ipatests/test_xmlrpc/test_trust_plugin.py
@@ -23,7 +23,7 @@ Test the `ipalib/plugins/trust.py` module.
import nose
from ipalib import api, errors
from ipapython.dn import DN
-from tests.test_xmlrpc import objectclasses
+from ipatests.test_xmlrpc import objectclasses
from xmlrpc_test import (Declarative, fuzzy_guid, fuzzy_domain_sid, fuzzy_string,
fuzzy_uuid, fuzzy_digits)
diff --git a/tests/test_xmlrpc/test_user_plugin.py b/ipatests/test_xmlrpc/test_user_plugin.py
index 7e99222..ca6ff16 100644
--- a/tests/test_xmlrpc/test_user_plugin.py
+++ b/ipatests/test_xmlrpc/test_user_plugin.py
@@ -24,8 +24,8 @@ Test the `ipalib/plugins/user.py` module.
"""
from ipalib import api, errors, messages
-from tests.test_xmlrpc import objectclasses
-from tests.util import assert_equal, assert_not_equal
+from ipatests.test_xmlrpc import objectclasses
+from ipatests.util import assert_equal, assert_not_equal
from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid, fuzzy_password, fuzzy_string, fuzzy_dergeneralizedtime
from ipapython.dn import DN
from ipapython.version import API_VERSION
diff --git a/tests/test_xmlrpc/xmlrpc_test.py b/ipatests/test_xmlrpc/xmlrpc_test.py
index 89f1adc..bfe8efa 100644
--- a/tests/test_xmlrpc/xmlrpc_test.py
+++ b/ipatests/test_xmlrpc/xmlrpc_test.py
@@ -24,7 +24,7 @@ Base class for all XML-RPC tests
import sys
import socket
import nose
-from tests.util import assert_deepequal, Fuzzy
+from ipatests.util import assert_deepequal, Fuzzy
from ipalib import api, request, errors
from ipalib.x509 import valid_issuer
from ipapython.version import API_VERSION
diff --git a/tests/util.py b/ipatests/util.py
index 117d2c8..117d2c8 100644
--- a/tests/util.py
+++ b/ipatests/util.py
diff --git a/make-doc b/make-doc
index e4cca3e..57509aa 100755
--- a/make-doc
+++ b/make-doc
@@ -2,7 +2,7 @@
# Hackish script to generate documentation using epydoc
-sources="ipalib ipaserver tests"
+sources="ipalib ipaserver ipatests"
out="./freeipa2-dev-doc"
init="./ipalib/__init__.py"
diff --git a/make-lint b/make-lint
index fa5aae7..4f3e94a 100755
--- a/make-lint
+++ b/make-lint
@@ -38,7 +38,7 @@ except ImportError:
# File names to ignore when searching for python source files
IGNORE_FILES = ('.*', '*~', '*.in', '*.pyc', '*.pyo')
IGNORE_PATHS = ('build', 'rpmbuild', 'dist', 'install/po/test_i18n.py',
- 'lite-server.py', 'make-lint', 'make-test', 'tests')
+ 'lite-server.py', 'make-lint', 'make-test', 'ipatests')
class IPATypeChecker(TypeChecker):
NAMESPACE_ATTRS = ['Command', 'Object', 'Method', 'Property', 'Backend',
diff --git a/make-testcert b/make-testcert
index a5814e1..19c188a 100755
--- a/make-testcert
+++ b/make-testcert
@@ -21,7 +21,7 @@
"""
Generate a custom certificate used in the service unit tests. The certificate
-will be created in tests/test_xmlrpc/service.crt
+will be created in ipatests/test_xmlrpc/service.crt
"""
import sys
import os
@@ -33,7 +33,7 @@ from ipaserver.plugins import rabase
from ipapython import ipautil
from ipapython.dn import DN
-CERTPATH = 'tests/test_xmlrpc/service.crt'
+CERTPATH = 'ipatests/test_xmlrpc/service.crt'
def run_certutil(reqdir, args, stdin=None):
"""
@@ -86,7 +86,7 @@ def makecert(reqdir):
ra = rabase.rabase()
if not os.path.exists(ra.sec_dir) and api.env.xmlrpc_uri == 'http://localhost:8888/ipa/xml':
- sys.exit('The in-tree self-signed CA is not configured, see tests/test_xmlrpc/test_cert.py')
+ sys.exit('The in-tree self-signed CA is not configured, see ipatests/test_xmlrpc/test_cert.py')
pwname = reqdir + "/pwd"