From c60142efda817f030a7495cd6fe4a19953e55afa Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Tue, 21 May 2013 13:40:27 +0200 Subject: [PATCH] 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 --- .gitignore | 1 + Makefile | 16 +++- freeipa.spec.in | 43 +++++++++ install/po/Makefile.in | 4 +- {tests => ipatests}/__init__.py | 0 {tests => ipatests}/data.py | 0 {tests => ipatests}/i18n.py | 0 ipatests/setup.py.in | 87 +++++++++++++++++++ {tests => ipatests}/test_cmdline/cmdline.py | 2 +- {tests => ipatests}/test_cmdline/test_cli.py | 2 +- {tests => ipatests}/test_cmdline/test_help.py | 0 .../test_cmdline/test_ipagetkeytab.py | 0 .../test_install/0_reset.update | 0 {tests => ipatests}/test_install/1_add.update | 0 .../test_install/2_update.update | 0 .../test_install/3_update.update | 0 .../test_install/4_update.update | 0 .../test_install/5_update.update | 0 .../test_install/6_update.update | 0 .../test_install/8_badsyntax.update | 0 .../test_install/9_badsyntax.update | 0 {tests => ipatests}/test_install/__init__.py | 0 .../test_install/test_updates.py | 4 +- {tests => ipatests}/test_ipalib/__init__.py | 0 .../test_ipalib/test_backend.py | 4 +- {tests => ipatests}/test_ipalib/test_base.py | 2 +- .../test_ipalib/test_capabilities.py | 0 {tests => ipatests}/test_ipalib/test_cli.py | 2 +- .../test_ipalib/test_config.py | 6 +- {tests => ipatests}/test_ipalib/test_crud.py | 2 +- .../test_ipalib/test_errors.py | 2 +- .../test_ipalib/test_frontend.py | 6 +- .../test_ipalib/test_messages.py | 2 +- .../test_ipalib/test_output.py | 2 +- .../test_ipalib/test_parameters.py | 6 +- .../test_ipalib/test_plugable.py | 8 +- {tests => ipatests}/test_ipalib/test_rpc.py | 4 +- {tests => ipatests}/test_ipalib/test_text.py | 4 +- {tests => ipatests}/test_ipalib/test_util.py | 0 {tests => ipatests}/test_ipalib/test_x509.py | 6 +- .../test_ipapython/__init__.py | 0 .../test_ipapython/test_cookie.py | 0 {tests => ipatests}/test_ipapython/test_dn.py | 0 .../test_ipapython/test_ipautil.py | 0 .../test_ipapython/test_keyring.py | 0 .../test_ipapython/test_ssh.py | 0 .../test_ipaserver/__init__.py | 0 .../test_ipaserver/httptest.py | 0 .../install/test_adtrustinstance.py | 0 .../test_ipaserver/test_changepw.py | 4 +- .../test_ipaserver/test_ldap.py | 0 .../test_ipaserver/test_rpcserver.py | 4 +- {tests => ipatests}/test_pkcs10/__init__.py | 0 {tests => ipatests}/test_pkcs10/test0.csr | 0 {tests => ipatests}/test_pkcs10/test1.csr | 0 {tests => ipatests}/test_pkcs10/test2.csr | 0 {tests => ipatests}/test_pkcs10/test3.csr | 0 {tests => ipatests}/test_pkcs10/test4.csr | 0 {tests => ipatests}/test_pkcs10/test5.csr | 0 .../test_pkcs10/test_pkcs10.py | 6 +- {tests => ipatests}/test_util.py | 0 {tests => ipatests}/test_xmlrpc/__init__.py | 0 .../test_xmlrpc/objectclasses.py | 0 {tests => ipatests}/test_xmlrpc/test_attr.py | 2 +- .../test_xmlrpc/test_automember_plugin.py | 2 +- .../test_xmlrpc/test_automount_plugin.py | 2 +- .../test_xmlrpc/test_baseldap_plugin.py | 0 .../test_xmlrpc/test_batch_plugin.py | 4 +- .../test_xmlrpc/test_cert_plugin.py | 0 .../test_xmlrpc/test_config_plugin.py | 0 .../test_xmlrpc/test_delegation_plugin.py | 2 +- .../test_xmlrpc/test_dns_plugin.py | 2 +- .../test_dns_realmdomains_integration.py | 2 +- .../test_xmlrpc/test_external_members.py | 2 +- .../test_xmlrpc/test_group_plugin.py | 4 +- .../test_xmlrpc/test_hbac_plugin.py | 0 .../test_xmlrpc/test_hbacsvcgroup_plugin.py | 4 +- .../test_xmlrpc/test_hbactest_plugin.py | 0 .../test_xmlrpc/test_host_plugin.py | 6 +- .../test_xmlrpc/test_hostgroup_plugin.py | 4 +- .../test_xmlrpc/test_krbtpolicy.py | 2 +- .../test_xmlrpc/test_nesting.py | 2 +- .../test_xmlrpc/test_netgroup_plugin.py | 5 +- .../test_xmlrpc/test_passwd_plugin.py | 0 .../test_xmlrpc/test_permission_plugin.py | 2 +- .../test_xmlrpc/test_ping_plugin.py | 2 +- .../test_xmlrpc/test_privilege_plugin.py | 2 +- .../test_xmlrpc/test_pwpolicy_plugin.py | 0 .../test_xmlrpc/test_range_plugin.py | 4 +- .../test_xmlrpc/test_realmdomains_plugin.py | 2 +- .../test_xmlrpc/test_replace.py | 2 +- .../test_xmlrpc/test_role_plugin.py | 2 +- .../test_xmlrpc/test_selfservice_plugin.py | 2 +- .../test_xmlrpc/test_selinuxusermap_plugin.py | 4 +- .../test_xmlrpc/test_service_plugin.py | 10 +-- .../test_xmlrpc/test_sudocmd_plugin.py | 4 +- .../test_xmlrpc/test_sudocmdgroup_plugin.py | 2 +- .../test_xmlrpc/test_sudorule_plugin.py | 0 .../test_xmlrpc/test_trust_plugin.py | 2 +- .../test_xmlrpc/test_user_plugin.py | 4 +- .../test_xmlrpc/xmlrpc_test.py | 2 +- {tests => ipatests}/util.py | 0 make-doc | 2 +- make-lint | 2 +- make-testcert | 6 +- 105 files changed, 237 insertions(+), 93 deletions(-) rename {tests => ipatests}/__init__.py (100%) rename {tests => ipatests}/data.py (100%) rename {tests => ipatests}/i18n.py (100%) create mode 100644 ipatests/setup.py.in rename {tests => ipatests}/test_cmdline/cmdline.py (97%) rename {tests => ipatests}/test_cmdline/test_cli.py (99%) rename {tests => ipatests}/test_cmdline/test_help.py (100%) rename {tests => ipatests}/test_cmdline/test_ipagetkeytab.py (100%) rename {tests => ipatests}/test_install/0_reset.update (100%) rename {tests => ipatests}/test_install/1_add.update (100%) rename {tests => ipatests}/test_install/2_update.update (100%) rename {tests => ipatests}/test_install/3_update.update (100%) rename {tests => ipatests}/test_install/4_update.update (100%) rename {tests => ipatests}/test_install/5_update.update (100%) rename {tests => ipatests}/test_install/6_update.update (100%) rename {tests => ipatests}/test_install/8_badsyntax.update (100%) rename {tests => ipatests}/test_install/9_badsyntax.update (100%) rename {tests => ipatests}/test_install/__init__.py (100%) rename {tests => ipatests}/test_install/test_updates.py (98%) rename {tests => ipatests}/test_ipalib/__init__.py (100%) rename {tests => ipatests}/test_ipalib/test_backend.py (98%) rename {tests => ipatests}/test_ipalib/test_base.py (99%) rename {tests => ipatests}/test_ipalib/test_capabilities.py (100%) rename {tests => ipatests}/test_ipalib/test_cli.py (98%) rename {tests => ipatests}/test_ipalib/test_config.py (99%) rename {tests => ipatests}/test_ipalib/test_crud.py (99%) rename {tests => ipatests}/test_ipalib/test_errors.py (99%) rename {tests => ipatests}/test_ipalib/test_frontend.py (99%) rename {tests => ipatests}/test_ipalib/test_messages.py (98%) rename {tests => ipatests}/test_ipalib/test_output.py (98%) rename {tests => ipatests}/test_ipalib/test_parameters.py (99%) rename {tests => ipatests}/test_ipalib/test_plugable.py (98%) rename {tests => ipatests}/test_ipalib/test_rpc.py (98%) rename {tests => ipatests}/test_ipalib/test_text.py (99%) rename {tests => ipatests}/test_ipalib/test_util.py (100%) rename {tests => ipatests}/test_ipalib/test_x509.py (96%) rename {tests => ipatests}/test_ipapython/__init__.py (100%) rename {tests => ipatests}/test_ipapython/test_cookie.py (100%) rename {tests => ipatests}/test_ipapython/test_dn.py (100%) rename {tests => ipatests}/test_ipapython/test_ipautil.py (100%) rename {tests => ipatests}/test_ipapython/test_keyring.py (100%) rename {tests => ipatests}/test_ipapython/test_ssh.py (100%) rename {tests => ipatests}/test_ipaserver/__init__.py (100%) rename {tests => ipatests}/test_ipaserver/httptest.py (100%) rename {tests => ipatests}/test_ipaserver/install/test_adtrustinstance.py (100%) rename {tests => ipatests}/test_ipaserver/test_changepw.py (97%) rename {tests => ipatests}/test_ipaserver/test_ldap.py (100%) rename {tests => ipatests}/test_ipaserver/test_rpcserver.py (98%) rename {tests => ipatests}/test_pkcs10/__init__.py (100%) rename {tests => ipatests}/test_pkcs10/test0.csr (100%) rename {tests => ipatests}/test_pkcs10/test1.csr (100%) rename {tests => ipatests}/test_pkcs10/test2.csr (100%) rename {tests => ipatests}/test_pkcs10/test3.csr (100%) rename {tests => ipatests}/test_pkcs10/test4.csr (100%) rename {tests => ipatests}/test_pkcs10/test5.csr (100%) rename {tests => ipatests}/test_pkcs10/test_pkcs10.py (95%) rename {tests => ipatests}/test_util.py (100%) rename {tests => ipatests}/test_xmlrpc/__init__.py (100%) rename {tests => ipatests}/test_xmlrpc/objectclasses.py (100%) rename {tests => ipatests}/test_xmlrpc/test_attr.py (99%) rename {tests => ipatests}/test_xmlrpc/test_automember_plugin.py (99%) rename {tests => ipatests}/test_xmlrpc/test_automount_plugin.py (99%) rename {tests => ipatests}/test_xmlrpc/test_baseldap_plugin.py (100%) rename {tests => ipatests}/test_xmlrpc/test_batch_plugin.py (98%) rename {tests => ipatests}/test_xmlrpc/test_cert_plugin.py (100%) rename {tests => ipatests}/test_xmlrpc/test_config_plugin.py (100%) rename {tests => ipatests}/test_xmlrpc/test_delegation_plugin.py (99%) rename {tests => ipatests}/test_xmlrpc/test_dns_plugin.py (99%) rename {tests => ipatests}/test_xmlrpc/test_dns_realmdomains_integration.py (99%) rename {tests => ipatests}/test_xmlrpc/test_external_members.py (99%) rename {tests => ipatests}/test_xmlrpc/test_group_plugin.py (99%) rename {tests => ipatests}/test_xmlrpc/test_hbac_plugin.py (100%) rename {tests => ipatests}/test_xmlrpc/test_hbacsvcgroup_plugin.py (98%) rename {tests => ipatests}/test_xmlrpc/test_hbactest_plugin.py (100%) rename {tests => ipatests}/test_xmlrpc/test_host_plugin.py (99%) rename {tests => ipatests}/test_xmlrpc/test_hostgroup_plugin.py (98%) rename {tests => ipatests}/test_xmlrpc/test_krbtpolicy.py (99%) rename {tests => ipatests}/test_xmlrpc/test_nesting.py (99%) rename {tests => ipatests}/test_xmlrpc/test_netgroup_plugin.py (99%) rename {tests => ipatests}/test_xmlrpc/test_passwd_plugin.py (100%) rename {tests => ipatests}/test_xmlrpc/test_permission_plugin.py (99%) rename {tests => ipatests}/test_xmlrpc/test_ping_plugin.py (98%) rename {tests => ipatests}/test_xmlrpc/test_privilege_plugin.py (99%) rename {tests => ipatests}/test_xmlrpc/test_pwpolicy_plugin.py (100%) rename {tests => ipatests}/test_xmlrpc/test_range_plugin.py (99%) rename {tests => ipatests}/test_xmlrpc/test_realmdomains_plugin.py (99%) rename {tests => ipatests}/test_xmlrpc/test_replace.py (99%) rename {tests => ipatests}/test_xmlrpc/test_role_plugin.py (99%) rename {tests => ipatests}/test_xmlrpc/test_selfservice_plugin.py (99%) rename {tests => ipatests}/test_xmlrpc/test_selinuxusermap_plugin.py (99%) rename {tests => ipatests}/test_xmlrpc/test_service_plugin.py (98%) rename {tests => ipatests}/test_xmlrpc/test_sudocmd_plugin.py (98%) rename {tests => ipatests}/test_xmlrpc/test_sudocmdgroup_plugin.py (99%) rename {tests => ipatests}/test_xmlrpc/test_sudorule_plugin.py (100%) rename {tests => ipatests}/test_xmlrpc/test_trust_plugin.py (99%) rename {tests => ipatests}/test_xmlrpc/test_user_plugin.py (99%) rename {tests => ipatests}/test_xmlrpc/xmlrpc_test.py (99%) rename {tests => ipatests}/util.py (100%) diff --git a/.gitignore b/.gitignore index 1e97f62047d..8a2829a376d 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 550e529ea11..484144fd6f2 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 feb544276bb..7b74eb0d777 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 - 3.2.99-2 +- Add the freeipa-tests subpackage + * Thu Jun 13 2013 Martin Kosek - 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 bc91a933b9e..7ef03c5ec47 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 similarity index 100% rename from tests/__init__.py rename to ipatests/__init__.py diff --git a/tests/data.py b/ipatests/data.py similarity index 100% rename from tests/data.py rename to ipatests/data.py diff --git a/tests/i18n.py b/ipatests/i18n.py similarity index 100% rename from tests/i18n.py rename to ipatests/i18n.py diff --git a/ipatests/setup.py.in b/ipatests/setup.py.in new file mode 100644 index 00000000000..2517651db1c --- /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 . +# + +"""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 similarity index 97% rename from tests/test_cmdline/cmdline.py rename to ipatests/test_cmdline/cmdline.py index d86652bd12f..6f3541d2708 100644 --- a/tests/test_cmdline/cmdline.py +++ b/ipatests/test_cmdline/cmdline.py @@ -26,7 +26,7 @@ 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 similarity index 99% rename from tests/test_cmdline/test_cli.py rename to ipatests/test_cmdline/test_cli.py index bd1281e1d68..fe411b7033d 100644 --- a/tests/test_cmdline/test_cli.py +++ b/ipatests/test_cmdline/test_cli.py @@ -5,7 +5,7 @@ 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 similarity index 100% rename from tests/test_cmdline/test_help.py rename to ipatests/test_cmdline/test_help.py diff --git a/tests/test_cmdline/test_ipagetkeytab.py b/ipatests/test_cmdline/test_ipagetkeytab.py similarity index 100% rename from tests/test_cmdline/test_ipagetkeytab.py rename to ipatests/test_cmdline/test_ipagetkeytab.py diff --git a/tests/test_install/0_reset.update b/ipatests/test_install/0_reset.update similarity index 100% rename from tests/test_install/0_reset.update rename to ipatests/test_install/0_reset.update diff --git a/tests/test_install/1_add.update b/ipatests/test_install/1_add.update similarity index 100% rename from tests/test_install/1_add.update rename to ipatests/test_install/1_add.update diff --git a/tests/test_install/2_update.update b/ipatests/test_install/2_update.update similarity index 100% rename from tests/test_install/2_update.update rename to ipatests/test_install/2_update.update diff --git a/tests/test_install/3_update.update b/ipatests/test_install/3_update.update similarity index 100% rename from tests/test_install/3_update.update rename to ipatests/test_install/3_update.update diff --git a/tests/test_install/4_update.update b/ipatests/test_install/4_update.update similarity index 100% rename from tests/test_install/4_update.update rename to ipatests/test_install/4_update.update diff --git a/tests/test_install/5_update.update b/ipatests/test_install/5_update.update similarity index 100% rename from tests/test_install/5_update.update rename to ipatests/test_install/5_update.update diff --git a/tests/test_install/6_update.update b/ipatests/test_install/6_update.update similarity index 100% rename from tests/test_install/6_update.update rename to ipatests/test_install/6_update.update diff --git a/tests/test_install/8_badsyntax.update b/ipatests/test_install/8_badsyntax.update similarity index 100% rename from tests/test_install/8_badsyntax.update rename to ipatests/test_install/8_badsyntax.update diff --git a/tests/test_install/9_badsyntax.update b/ipatests/test_install/9_badsyntax.update similarity index 100% rename from tests/test_install/9_badsyntax.update rename to ipatests/test_install/9_badsyntax.update diff --git a/tests/test_install/__init__.py b/ipatests/test_install/__init__.py similarity index 100% rename from tests/test_install/__init__.py rename to ipatests/test_install/__init__.py diff --git a/tests/test_install/test_updates.py b/ipatests/test_install/test_updates.py similarity index 98% rename from tests/test_install/test_updates.py rename to ipatests/test_install/test_updates.py index b974aa3971c..c25d74a8af2 100644 --- a/tests/test_install/test_updates.py +++ b/ipatests/test_install/test_updates.py @@ -63,8 +63,8 @@ def setUp(self): 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 similarity index 100% rename from tests/test_ipalib/__init__.py rename to ipatests/test_ipalib/__init__.py diff --git a/tests/test_ipalib/test_backend.py b/ipatests/test_ipalib/test_backend.py similarity index 98% rename from tests/test_ipalib/test_backend.py rename to ipatests/test_ipalib/test_backend.py index e18c8d38273..3ebed4bbac1 100644 --- a/tests/test_ipalib/test_backend.py +++ b/ipatests/test_ipalib/test_backend.py @@ -22,8 +22,8 @@ """ 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 similarity index 99% rename from tests/test_ipalib/test_base.py rename to ipatests/test_ipalib/test_base.py index 78c8be032c6..ef6c180c798 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 similarity index 100% rename from tests/test_ipalib/test_capabilities.py rename to ipatests/test_ipalib/test_capabilities.py diff --git a/tests/test_ipalib/test_cli.py b/ipatests/test_ipalib/test_cli.py similarity index 98% rename from tests/test_ipalib/test_cli.py rename to ipatests/test_ipalib/test_cli.py index 0a6eeee1f9d..07935c5ba55 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 similarity index 99% rename from tests/test_ipalib/test_config.py rename to ipatests/test_ipalib/test_config.py index e729a62849f..f896b893601 100644 --- a/tests/test_ipalib/test_config.py +++ b/ipatests/test_ipalib/test_config.py @@ -26,9 +26,9 @@ 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 similarity index 99% rename from tests/test_ipalib/test_crud.py rename to ipatests/test_ipalib/test_crud.py index b19605be7ec..602f99f24f9 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 similarity index 99% rename from tests/test_ipalib/test_errors.py rename to ipatests/test_ipalib/test_errors.py index 49bed71048f..258af3b3f92 100644 --- a/tests/test_ipalib/test_errors.py +++ b/ipatests/test_ipalib/test_errors.py @@ -24,7 +24,7 @@ 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 similarity index 99% rename from tests/test_ipalib/test_frontend.py rename to ipatests/test_ipalib/test_frontend.py index 3a540608d55..310d7a53ddd 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 similarity index 98% rename from tests/test_ipalib/test_messages.py rename to ipatests/test_ipalib/test_messages.py index ebc400ee200..686bf8dd53b 100644 --- a/tests/test_ipalib/test_messages.py +++ b/ipatests/test_ipalib/test_messages.py @@ -23,7 +23,7 @@ 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 similarity index 98% rename from tests/test_ipalib/test_output.py rename to ipatests/test_ipalib/test_output.py index 741b8364246..15ef11e10f8 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 similarity index 99% rename from tests/test_ipalib/test_parameters.py rename to ipatests/test_ipalib/test_parameters.py index 192db3da774..71acfce71b5 100644 --- a/tests/test_ipalib/test_parameters.py +++ b/ipatests/test_ipalib/test_parameters.py @@ -27,9 +27,9 @@ 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 similarity index 98% rename from tests/test_ipalib/test_plugable.py rename to ipatests/test_ipalib/test_plugable.py index 3355e057a5d..c495e74dc69 100644 --- a/tests/test_ipalib/test_plugable.py +++ b/ipatests/test_ipalib/test_plugable.py @@ -22,9 +22,9 @@ """ 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 check(self.cls): 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 similarity index 98% rename from tests/test_ipalib/test_rpc.py rename to ipatests/test_ipalib/test_rpc.py index f8f078ddb27..56b8184cf78 100644 --- a/tests/test_ipalib/test_rpc.py +++ b/ipatests/test_ipalib/test_rpc.py @@ -23,8 +23,8 @@ 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 similarity index 99% rename from tests/test_ipalib/test_text.py rename to ipatests/test_ipalib/test_text.py index 9f60785ff33..2a5ff7a3610 100644 --- a/tests/test_ipalib/test_text.py +++ b/ipatests/test_ipalib/test_text.py @@ -27,8 +27,8 @@ 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 similarity index 100% rename from tests/test_ipalib/test_util.py rename to ipatests/test_ipalib/test_util.py diff --git a/tests/test_ipalib/test_x509.py b/ipatests/test_ipalib/test_x509.py similarity index 96% rename from tests/test_ipalib/test_x509.py rename to ipatests/test_ipalib/test_x509.py index cf076313e48..c7fafbbd95f 100644 --- a/tests/test_ipalib/test_x509.py +++ b/ipatests/test_ipalib/test_x509.py @@ -24,9 +24,9 @@ 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 similarity index 100% rename from tests/test_ipapython/__init__.py rename to ipatests/test_ipapython/__init__.py diff --git a/tests/test_ipapython/test_cookie.py b/ipatests/test_ipapython/test_cookie.py similarity index 100% rename from tests/test_ipapython/test_cookie.py rename to ipatests/test_ipapython/test_cookie.py diff --git a/tests/test_ipapython/test_dn.py b/ipatests/test_ipapython/test_dn.py similarity index 100% rename from tests/test_ipapython/test_dn.py rename to ipatests/test_ipapython/test_dn.py diff --git a/tests/test_ipapython/test_ipautil.py b/ipatests/test_ipapython/test_ipautil.py similarity index 100% rename from tests/test_ipapython/test_ipautil.py rename to ipatests/test_ipapython/test_ipautil.py diff --git a/tests/test_ipapython/test_keyring.py b/ipatests/test_ipapython/test_keyring.py similarity index 100% rename from tests/test_ipapython/test_keyring.py rename to ipatests/test_ipapython/test_keyring.py diff --git a/tests/test_ipapython/test_ssh.py b/ipatests/test_ipapython/test_ssh.py similarity index 100% rename from tests/test_ipapython/test_ssh.py rename to ipatests/test_ipapython/test_ssh.py diff --git a/tests/test_ipaserver/__init__.py b/ipatests/test_ipaserver/__init__.py similarity index 100% rename from tests/test_ipaserver/__init__.py rename to ipatests/test_ipaserver/__init__.py diff --git a/tests/test_ipaserver/httptest.py b/ipatests/test_ipaserver/httptest.py similarity index 100% rename from tests/test_ipaserver/httptest.py rename to ipatests/test_ipaserver/httptest.py diff --git a/tests/test_ipaserver/install/test_adtrustinstance.py b/ipatests/test_ipaserver/install/test_adtrustinstance.py similarity index 100% rename from tests/test_ipaserver/install/test_adtrustinstance.py rename to ipatests/test_ipaserver/install/test_adtrustinstance.py diff --git a/tests/test_ipaserver/test_changepw.py b/ipatests/test_ipaserver/test_changepw.py similarity index 97% rename from tests/test_ipaserver/test_changepw.py rename to ipatests/test_ipaserver/test_changepw.py index 4491e0b6e80..040c9cd36e8 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 similarity index 100% rename from tests/test_ipaserver/test_ldap.py rename to ipatests/test_ipaserver/test_ldap.py diff --git a/tests/test_ipaserver/test_rpcserver.py b/ipatests/test_ipaserver/test_rpcserver.py similarity index 98% rename from tests/test_ipaserver/test_rpcserver.py rename to ipatests/test_ipaserver/test_rpcserver.py index a75a85e0961..bd567384457 100644 --- a/tests/test_ipaserver/test_rpcserver.py +++ b/ipatests/test_ipaserver/test_rpcserver.py @@ -23,8 +23,8 @@ 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 similarity index 100% rename from tests/test_pkcs10/__init__.py rename to ipatests/test_pkcs10/__init__.py diff --git a/tests/test_pkcs10/test0.csr b/ipatests/test_pkcs10/test0.csr similarity index 100% rename from tests/test_pkcs10/test0.csr rename to ipatests/test_pkcs10/test0.csr diff --git a/tests/test_pkcs10/test1.csr b/ipatests/test_pkcs10/test1.csr similarity index 100% rename from tests/test_pkcs10/test1.csr rename to ipatests/test_pkcs10/test1.csr diff --git a/tests/test_pkcs10/test2.csr b/ipatests/test_pkcs10/test2.csr similarity index 100% rename from tests/test_pkcs10/test2.csr rename to ipatests/test_pkcs10/test2.csr diff --git a/tests/test_pkcs10/test3.csr b/ipatests/test_pkcs10/test3.csr similarity index 100% rename from tests/test_pkcs10/test3.csr rename to ipatests/test_pkcs10/test3.csr diff --git a/tests/test_pkcs10/test4.csr b/ipatests/test_pkcs10/test4.csr similarity index 100% rename from tests/test_pkcs10/test4.csr rename to ipatests/test_pkcs10/test4.csr diff --git a/tests/test_pkcs10/test5.csr b/ipatests/test_pkcs10/test5.csr similarity index 100% rename from tests/test_pkcs10/test5.csr rename to ipatests/test_pkcs10/test5.csr diff --git a/tests/test_pkcs10/test_pkcs10.py b/ipatests/test_pkcs10/test_pkcs10.py similarity index 95% rename from tests/test_pkcs10/test_pkcs10.py rename to ipatests/test_pkcs10/test_pkcs10.py index 381bf9e86d3..6b3534b339c 100644 --- a/tests/test_pkcs10/test_pkcs10.py +++ b/ipatests/test_pkcs10/test_pkcs10.py @@ -23,7 +23,7 @@ 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 @@ def setUp(self): 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 similarity index 100% rename from tests/test_util.py rename to ipatests/test_util.py diff --git a/tests/test_xmlrpc/__init__.py b/ipatests/test_xmlrpc/__init__.py similarity index 100% rename from tests/test_xmlrpc/__init__.py rename to ipatests/test_xmlrpc/__init__.py diff --git a/tests/test_xmlrpc/objectclasses.py b/ipatests/test_xmlrpc/objectclasses.py similarity index 100% rename from tests/test_xmlrpc/objectclasses.py rename to ipatests/test_xmlrpc/objectclasses.py diff --git a/tests/test_xmlrpc/test_attr.py b/ipatests/test_xmlrpc/test_attr.py similarity index 99% rename from tests/test_xmlrpc/test_attr.py rename to ipatests/test_xmlrpc/test_attr.py index 050ea08cc7b..ef5b882c54f 100644 --- a/tests/test_xmlrpc/test_attr.py +++ b/ipatests/test_xmlrpc/test_attr.py @@ -22,7 +22,7 @@ """ 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 similarity index 99% rename from tests/test_xmlrpc/test_automember_plugin.py rename to ipatests/test_xmlrpc/test_automember_plugin.py index fdf3c73af35..a50860e6654 100644 --- a/tests/test_xmlrpc/test_automember_plugin.py +++ b/ipatests/test_xmlrpc/test_automember_plugin.py @@ -23,7 +23,7 @@ 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 similarity index 99% rename from tests/test_xmlrpc/test_automount_plugin.py rename to ipatests/test_xmlrpc/test_automount_plugin.py index 19968a0dcd6..e1af651c877 100644 --- a/tests/test_xmlrpc/test_automount_plugin.py +++ b/ipatests/test_xmlrpc/test_automount_plugin.py @@ -32,7 +32,7 @@ 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 similarity index 100% rename from tests/test_xmlrpc/test_baseldap_plugin.py rename to 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 similarity index 98% rename from tests/test_xmlrpc/test_batch_plugin.py rename to ipatests/test_xmlrpc/test_batch_plugin.py index 55e557050c7..2b056c93ffe 100644 --- a/tests/test_xmlrpc/test_batch_plugin.py +++ b/ipatests/test_xmlrpc/test_batch_plugin.py @@ -22,8 +22,8 @@ """ 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 similarity index 100% rename from tests/test_xmlrpc/test_cert_plugin.py rename to 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 similarity index 100% rename from tests/test_xmlrpc/test_config_plugin.py rename to 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 similarity index 99% rename from tests/test_xmlrpc/test_delegation_plugin.py rename to ipatests/test_xmlrpc/test_delegation_plugin.py index bc3b96a2736..f2cfc830295 100644 --- a/tests/test_xmlrpc/test_delegation_plugin.py +++ b/ipatests/test_xmlrpc/test_delegation_plugin.py @@ -22,7 +22,7 @@ """ 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 similarity index 99% rename from tests/test_xmlrpc/test_dns_plugin.py rename to ipatests/test_xmlrpc/test_dns_plugin.py index 0d78f80b020..ea9b70e36e3 100644 --- a/tests/test_xmlrpc/test_dns_plugin.py +++ b/ipatests/test_xmlrpc/test_dns_plugin.py @@ -23,7 +23,7 @@ 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 similarity index 99% rename from tests/test_xmlrpc/test_dns_realmdomains_integration.py rename to ipatests/test_xmlrpc/test_dns_realmdomains_integration.py index c4660a577b0..1e46d362e1e 100644 --- a/tests/test_xmlrpc/test_dns_realmdomains_integration.py +++ b/ipatests/test_xmlrpc/test_dns_realmdomains_integration.py @@ -24,7 +24,7 @@ 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 similarity index 99% rename from tests/test_xmlrpc/test_external_members.py rename to ipatests/test_xmlrpc/test_external_members.py index 6f9949f4555..112470dcb53 100644 --- a/tests/test_xmlrpc/test_external_members.py +++ b/ipatests/test_xmlrpc/test_external_members.py @@ -24,7 +24,7 @@ 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 similarity index 99% rename from tests/test_xmlrpc/test_group_plugin.py rename to ipatests/test_xmlrpc/test_group_plugin.py index 7a9b8b6d1b3..1d0cfeb160f 100644 --- a/tests/test_xmlrpc/test_group_plugin.py +++ b/ipatests/test_xmlrpc/test_group_plugin.py @@ -22,8 +22,8 @@ """ 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 similarity index 100% rename from tests/test_xmlrpc/test_hbac_plugin.py rename to 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 similarity index 98% rename from tests/test_xmlrpc/test_hbacsvcgroup_plugin.py rename to ipatests/test_xmlrpc/test_hbacsvcgroup_plugin.py index 591c8a966a5..8140741d95d 100644 --- a/tests/test_xmlrpc/test_hbacsvcgroup_plugin.py +++ b/ipatests/test_xmlrpc/test_hbacsvcgroup_plugin.py @@ -22,8 +22,8 @@ """ 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 similarity index 100% rename from tests/test_xmlrpc/test_hbactest_plugin.py rename to 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 similarity index 99% rename from tests/test_xmlrpc/test_host_plugin.py rename to ipatests/test_xmlrpc/test_host_plugin.py index 07faf776072..a23a34112f5 100644 --- a/tests/test_xmlrpc/test_host_plugin.py +++ b/ipatests/test_xmlrpc/test_host_plugin.py @@ -29,10 +29,10 @@ 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 @@ 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 similarity index 98% rename from tests/test_xmlrpc/test_hostgroup_plugin.py rename to ipatests/test_xmlrpc/test_hostgroup_plugin.py index 36c497ba8dc..b610979ece1 100644 --- a/tests/test_xmlrpc/test_hostgroup_plugin.py +++ b/ipatests/test_xmlrpc/test_hostgroup_plugin.py @@ -23,8 +23,8 @@ """ 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 similarity index 99% rename from tests/test_xmlrpc/test_krbtpolicy.py rename to ipatests/test_xmlrpc/test_krbtpolicy.py index c61e754d263..b940c5e5d58 100644 --- a/tests/test_xmlrpc/test_krbtpolicy.py +++ b/ipatests/test_xmlrpc/test_krbtpolicy.py @@ -21,7 +21,7 @@ """ 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 similarity index 99% rename from tests/test_xmlrpc/test_nesting.py rename to ipatests/test_xmlrpc/test_nesting.py index e1b41b2845e..5c093c93aae 100644 --- a/tests/test_xmlrpc/test_nesting.py +++ b/ipatests/test_xmlrpc/test_nesting.py @@ -21,7 +21,7 @@ """ 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 similarity index 99% rename from tests/test_xmlrpc/test_netgroup_plugin.py rename to ipatests/test_xmlrpc/test_netgroup_plugin.py index ee826b75210..3dccac1bd19 100644 --- a/tests/test_xmlrpc/test_netgroup_plugin.py +++ b/ipatests/test_xmlrpc/test_netgroup_plugin.py @@ -26,8 +26,9 @@ 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 similarity index 100% rename from tests/test_xmlrpc/test_passwd_plugin.py rename to 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 similarity index 99% rename from tests/test_xmlrpc/test_permission_plugin.py rename to ipatests/test_xmlrpc/test_permission_plugin.py index 4a81f974657..dbd9d690147 100644 --- a/tests/test_xmlrpc/test_permission_plugin.py +++ b/ipatests/test_xmlrpc/test_permission_plugin.py @@ -23,7 +23,7 @@ """ 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 similarity index 98% rename from tests/test_xmlrpc/test_ping_plugin.py rename to ipatests/test_xmlrpc/test_ping_plugin.py index 3673b436f8d..1d401993a89 100644 --- a/tests/test_xmlrpc/test_ping_plugin.py +++ b/ipatests/test_xmlrpc/test_ping_plugin.py @@ -22,7 +22,7 @@ """ 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 similarity index 99% rename from tests/test_xmlrpc/test_privilege_plugin.py rename to ipatests/test_xmlrpc/test_privilege_plugin.py index 81e51d5e193..741590dd012 100644 --- a/tests/test_xmlrpc/test_privilege_plugin.py +++ b/ipatests/test_xmlrpc/test_privilege_plugin.py @@ -22,7 +22,7 @@ """ 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 similarity index 100% rename from tests/test_xmlrpc/test_pwpolicy_plugin.py rename to 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 similarity index 99% rename from tests/test_xmlrpc/test_range_plugin.py rename to ipatests/test_xmlrpc/test_range_plugin.py index ce70433112b..cbb700e9920 100644 --- a/tests/test_xmlrpc/test_range_plugin.py +++ b/ipatests/test_xmlrpc/test_range_plugin.py @@ -22,9 +22,9 @@ """ 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 similarity index 99% rename from tests/test_xmlrpc/test_realmdomains_plugin.py rename to ipatests/test_xmlrpc/test_realmdomains_plugin.py index 22cac22863c..8abb53e482f 100644 --- a/tests/test_xmlrpc/test_realmdomains_plugin.py +++ b/ipatests/test_xmlrpc/test_realmdomains_plugin.py @@ -22,7 +22,7 @@ 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 similarity index 99% rename from tests/test_xmlrpc/test_replace.py rename to ipatests/test_xmlrpc/test_replace.py index 434f71d700a..281714b3e16 100644 --- a/tests/test_xmlrpc/test_replace.py +++ b/ipatests/test_xmlrpc/test_replace.py @@ -26,7 +26,7 @@ """ 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 similarity index 99% rename from tests/test_xmlrpc/test_role_plugin.py rename to ipatests/test_xmlrpc/test_role_plugin.py index be3fecebc8d..119bfb1a87b 100644 --- a/tests/test_xmlrpc/test_role_plugin.py +++ b/ipatests/test_xmlrpc/test_role_plugin.py @@ -23,7 +23,7 @@ """ 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 similarity index 99% rename from tests/test_xmlrpc/test_selfservice_plugin.py rename to ipatests/test_xmlrpc/test_selfservice_plugin.py index fa67cbc2d8c..c78edbc22ca 100644 --- a/tests/test_xmlrpc/test_selfservice_plugin.py +++ b/ipatests/test_xmlrpc/test_selfservice_plugin.py @@ -22,7 +22,7 @@ """ 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 similarity index 99% rename from tests/test_xmlrpc/test_selinuxusermap_plugin.py rename to ipatests/test_xmlrpc/test_selinuxusermap_plugin.py index ad3cb34651c..5bfe5475c2b 100644 --- a/tests/test_xmlrpc/test_selinuxusermap_plugin.py +++ b/ipatests/test_xmlrpc/test_selinuxusermap_plugin.py @@ -21,10 +21,10 @@ """ 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 similarity index 98% rename from tests/test_xmlrpc/test_service_plugin.py rename to ipatests/test_xmlrpc/test_service_plugin.py index 6f8dbbee713..f51954eb377 100644 --- a/tests/test_xmlrpc/test_service_plugin.py +++ b/ipatests/test_xmlrpc/test_service_plugin.py @@ -22,10 +22,10 @@ """ 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 @@ 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 similarity index 98% rename from tests/test_xmlrpc/test_sudocmd_plugin.py rename to ipatests/test_xmlrpc/test_sudocmd_plugin.py index 7b355072bc5..fe91705c22e 100644 --- a/tests/test_xmlrpc/test_sudocmd_plugin.py +++ b/ipatests/test_xmlrpc/test_sudocmd_plugin.py @@ -22,9 +22,9 @@ """ 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 similarity index 99% rename from tests/test_xmlrpc/test_sudocmdgroup_plugin.py rename to ipatests/test_xmlrpc/test_sudocmdgroup_plugin.py index 7d688dc3281..397d476834b 100644 --- a/tests/test_xmlrpc/test_sudocmdgroup_plugin.py +++ b/ipatests/test_xmlrpc/test_sudocmdgroup_plugin.py @@ -21,7 +21,7 @@ """ 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 similarity index 100% rename from tests/test_xmlrpc/test_sudorule_plugin.py rename to 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 similarity index 99% rename from tests/test_xmlrpc/test_trust_plugin.py rename to ipatests/test_xmlrpc/test_trust_plugin.py index 7627be74813..0223e8b3628 100644 --- a/tests/test_xmlrpc/test_trust_plugin.py +++ b/ipatests/test_xmlrpc/test_trust_plugin.py @@ -23,7 +23,7 @@ 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 similarity index 99% rename from tests/test_xmlrpc/test_user_plugin.py rename to ipatests/test_xmlrpc/test_user_plugin.py index 7e992224c66..ca6ff16c603 100644 --- a/tests/test_xmlrpc/test_user_plugin.py +++ b/ipatests/test_xmlrpc/test_user_plugin.py @@ -24,8 +24,8 @@ """ 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 similarity index 99% rename from tests/test_xmlrpc/xmlrpc_test.py rename to ipatests/test_xmlrpc/xmlrpc_test.py index 89f1adc38d2..bfe8efa468b 100644 --- a/tests/test_xmlrpc/xmlrpc_test.py +++ b/ipatests/test_xmlrpc/xmlrpc_test.py @@ -24,7 +24,7 @@ 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 similarity index 100% rename from tests/util.py rename to ipatests/util.py diff --git a/make-doc b/make-doc index e4cca3e89f9..57509aa05fd 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 fa5aae7d88b..4f3e94afe14 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 a5814e1de94..19c188a717b 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"