From 5da309ee11f2aaba687d12a8c517f64070e22ae8 Mon Sep 17 00:00:00 2001 From: Stanislav Levin Date: Apr 28 2020 15:50:10 +0000 Subject: ipatests: Pretty print multihost config The printing of string representation of multihost config is useless. For example, ``` ``` The dictionary representation of such looks better: ``` [ipatests.pytest_ipa.integration] {'ad_admin_name': 'Administrator', 'ad_admin_password': 'Secret123', 'admin_name': 'admin', 'admin_password': 'Secret123', 'dirman_dn': 'cn=Directory Manager', 'dirman_password': 'Secret123', 'dns_forwarder': '8.8.8.8', 'domain_level': 1, 'domains': [{'hosts': [{'external_hostname': 'master1.ipa.test', 'ip': '172.19.0.2', 'name': 'master1.ipa.test', 'role': 'master'}, {'external_hostname': 'replica1.ipa.test', 'ip': '172.19.0.3', 'name': 'replica1.ipa.test', 'role': 'replica'}, ... ``` Fixes: https://pagure.io/freeipa/issue/8265 Signed-off-by: Stanislav Levin Reviewed-By: Rob Crittenden --- diff --git a/ipatests/pytest_ipa/integration/__init__.py b/ipatests/pytest_ipa/integration/__init__.py index f7a31c8..3b2ff3c 100644 --- a/ipatests/pytest_ipa/integration/__init__.py +++ b/ipatests/pytest_ipa/integration/__init__.py @@ -21,6 +21,8 @@ from __future__ import print_function, absolute_import +from pprint import pformat + import logging import os import tempfile @@ -260,7 +262,8 @@ def mh(request, class_integration_logs): host.external_hostname, filename) class_integration_logs.setdefault(host, []).append(filename) - print(mh.config) + if logger.isEnabledFor(logging.INFO): + logger.info(pformat(mh.config.to_dict())) for host in mh.config.get_all_hosts(): host.add_log_collector(collect_log) logger.info('Preparing host %s', host.hostname)