summaryrefslogtreecommitdiffstats
path: root/ipatests
diff options
context:
space:
mode:
authorJan Cholasta <jcholast@redhat.com>2016-01-06 13:10:11 +0100
committerMartin Basti <mbasti@redhat.com>2016-01-21 10:21:32 +0100
commit500ee7e2b1fdaa9669cf136a380907cfe4f0f225 (patch)
tree79b5f3ce0c8d0d6caa68512b468d96c76b2daebf /ipatests
parentf5f5c8c603e95d246d2cde92f56959fedba4666d (diff)
downloadfreeipa-500ee7e2b1fdaa9669cf136a380907cfe4f0f225.tar.gz
freeipa-500ee7e2b1fdaa9669cf136a380907cfe4f0f225.tar.xz
freeipa-500ee7e2b1fdaa9669cf136a380907cfe4f0f225.zip
ipapython: port p11helper C code to Python
This replaces the binary _ipap11helper module with cffi-based Python code. https://fedorahosted.org/freeipa/ticket/5596 Reviewed-By: Martin Basti <mbasti@redhat.com>
Diffstat (limited to 'ipatests')
-rw-r--r--ipatests/pytest.ini1
-rw-r--r--ipatests/test_ipapython/test_ipap11helper.py2
2 files changed, 1 insertions, 2 deletions
diff --git a/ipatests/pytest.ini b/ipatests/pytest.ini
index e38858bc7..531eb847e 100644
--- a/ipatests/pytest.ini
+++ b/ipatests/pytest.ini
@@ -21,7 +21,6 @@ addopts = --doctest-modules
--ignore=doc/examples/python-api.py
--ignore=install/share/copy-schema-to-ca.py
--ignore=install/share/wsgi.py
- --ignore=ipapython/ipap11helper/setup.py
markers =
tier0: basic unit tests and critical functionality
tier1: functional API tests
diff --git a/ipatests/test_ipapython/test_ipap11helper.py b/ipatests/test_ipapython/test_ipap11helper.py
index 0b442b553..2c8fd2892 100644
--- a/ipatests/test_ipapython/test_ipap11helper.py
+++ b/ipatests/test_ipapython/test_ipap11helper.py
@@ -17,7 +17,7 @@ import tempfile
import pytest
from ipaplatform.paths import paths
-import _ipap11helper
+from ipapython import p11helper as _ipap11helper
pytestmark = pytest.mark.tier0