From 1e06a5195bafe0224d77371987f2509f5508ca2f Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Tue, 3 Jan 2017 18:04:53 +0100 Subject: Use pytest conftest.py and drop pytest.ini Let's replace some ugly hacks with proper pytest conftest.py hooks. Test initialization of ipalib.api is now handled in pytest_cmdline_main(). Pytest plugins, markers and ignores are also moved into conftest.py. Additional guards make it possible to run tests without ipaserver installed. I added confcutdir to ensure that pytest does not leave our project space. Pytest used pytest.ini or setup.py before but pytest.ini is gone. Signed-off-by: Christian Heimes Reviewed-By: Milan Kubik --- Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 73bd37899..9bfc899fe 100644 --- a/Makefile.am +++ b/Makefile.am @@ -37,8 +37,7 @@ EXTRA_DIST = .mailmap \ doc \ freeipa.spec.in \ ipasetup.py.in \ - pylintrc \ - pytest.ini + pylintrc clean-local: rm -rf "$(RPMBUILD)" -- cgit