summaryrefslogtreecommitdiffstats
path: root/ipatests/test_integration/test_testconfig.py
diff options
context:
space:
mode:
authorPetr Viktorin <pviktori@redhat.com>2014-11-13 16:23:56 +0100
committerTomas Babej <tbabej@redhat.com>2014-12-11 07:04:58 +0100
commit74f7d67fd5484137b77e54ab50d7869daa6a7db5 (patch)
tree976d9c22b7f0587135acdbb4418fec0155160c04 /ipatests/test_integration/test_testconfig.py
parent8822be36d342c2bc499937c3f144e11ae98d8e58 (diff)
downloadfreeipa-74f7d67fd5484137b77e54ab50d7869daa6a7db5.tar.gz
freeipa-74f7d67fd5484137b77e54ab50d7869daa6a7db5.tar.xz
freeipa-74f7d67fd5484137b77e54ab50d7869daa6a7db5.zip
test_integration: Use python-pytest-multihost
The core integration testing functionality was split into a separate project. Use this project, and configure it for FreeIPA. The "mh" (multihost) fixture is made available for integration tests. Configuration based on environment variables is moved into a separate module, to ease eventual deprecation. Reviewed-By: Tomas Babej <tbabej@redhat.com>
Diffstat (limited to 'ipatests/test_integration/test_testconfig.py')
-rw-r--r--ipatests/test_integration/test_testconfig.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/ipatests/test_integration/test_testconfig.py b/ipatests/test_integration/test_testconfig.py
index 974263669..219600344 100644
--- a/ipatests/test_integration/test_testconfig.py
+++ b/ipatests/test_integration/test_testconfig.py
@@ -27,13 +27,13 @@ from ipatests.util import assert_deepequal
DEFAULT_OUTPUT_DICT = {
"nis_domain": "ipatest",
"test_dir": "/root/ipatests",
- "debug": False,
"ad_admin_name": "Administrator",
"ipv6": False,
- "root_ssh_key_filename": "~/.ssh/id_rsa",
+ "ssh_key_filename": "~/.ssh/id_rsa",
+ "ssh_username": "root",
"admin_name": "admin",
"ad_admin_password": "Secret123",
- "root_password": None,
+ "ssh_password": None,
"dns_forwarder": "8.8.8.8",
"domains": [],
"dirman_dn": "cn=Directory Manager",