diff options
| author | Michal Reznik <mreznik@redhat.com> | 2017-12-07 14:46:06 +0100 |
|---|---|---|
| committer | Christian Heimes <cheimes@redhat.com> | 2018-01-09 10:17:01 +0100 |
| commit | 3bdac1a84d363c876fc4b735fa75590fcb3ffead (patch) | |
| tree | e59e9d533494ec2ec07d358517b82bde15db5277 | |
| parent | ad996d79c639f92f57a20503b583ae68c77521e8 (diff) | |
| download | freeipa-3bdac1a84d363c876fc4b735fa75590fcb3ffead.tar.gz freeipa-3bdac1a84d363c876fc4b735fa75590fcb3ffead.tar.xz freeipa-3bdac1a84d363c876fc4b735fa75590fcb3ffead.zip | |
tests: move CA related modules to pytest_plugins
Till now both create_caless_pki.py and create_external_ca.py were
stored in test_integration folder. However when trying to import
e.g. "from create_external_ca import ExternalCA" from tasks.py
where all other integration test`s support functions lives we get
"AttributeError: module 'pytest' has no attribute 'config' as pytest
was not completely initialized at the moment of the import.
https://pagure.io/freeipa/issue/7302
Reviewed-By: Florence Blanc-Renaud <frenaud@redhat.com>
| -rw-r--r-- | ipatests/pytest_plugins/integration/create_caless_pki.py (renamed from ipatests/test_integration/create_caless_pki.py) | 0 | ||||
| -rw-r--r-- | ipatests/pytest_plugins/integration/create_external_ca.py (renamed from ipatests/test_integration/create_external_ca.py) | 0 | ||||
| -rw-r--r-- | ipatests/test_integration/test_caless.py | 4 |
3 files changed, 2 insertions, 2 deletions
diff --git a/ipatests/test_integration/create_caless_pki.py b/ipatests/pytest_plugins/integration/create_caless_pki.py index 9a2e8e26b..9a2e8e26b 100644 --- a/ipatests/test_integration/create_caless_pki.py +++ b/ipatests/pytest_plugins/integration/create_caless_pki.py diff --git a/ipatests/test_integration/create_external_ca.py b/ipatests/pytest_plugins/integration/create_external_ca.py index dc4ef048c..dc4ef048c 100644 --- a/ipatests/test_integration/create_external_ca.py +++ b/ipatests/pytest_plugins/integration/create_external_ca.py diff --git a/ipatests/test_integration/test_caless.py b/ipatests/test_integration/test_caless.py index 7177c5d35..5faf0f429 100644 --- a/ipatests/test_integration/test_caless.py +++ b/ipatests/test_integration/test_caless.py @@ -33,9 +33,9 @@ from ipapython import ipautil from ipaplatform.paths import paths from ipapython.dn import DN from ipatests.test_integration.base import IntegrationTest -from ipatests.test_integration import create_caless_pki -from ipatests.test_integration.create_external_ca import ExternalCA from ipatests.pytest_plugins.integration import tasks +from ipatests.pytest_plugins.integration.create_external_ca import ExternalCA +from ipatests.pytest_plugins.integration import create_caless_pki from ipalib.constants import DOMAIN_LEVEL_0 if six.PY3: |