IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

ipatests: change logdir naming pattern for multihost tests

Browse Source 
Remove brackets from the paths in naming pattern of directories
for multihost logs. Brackets in filenames require special handling
in markdown URLs, bash paths etc.

Related: https://pagure.io/freeipa/issue/6971

Signed-off-by: Tomas Krizek <tkrizek@redhat.com>
Reviewed-By: Martin Basti <mbasti@redhat.com>
This commit is contained in:
Tomas Krizek 2017-05-22 18:27:44 +02:00 committed by Martin Basti
parent be1415b6cc
commit 906c4c9459
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ipatests/pytest_plugins/integration/__init__.py
View File

@ -24,6 +24,7 @@ from __future__ import print_function
import os
import tempfile
import shutil
import re
import pytest
from pytest_multihost import make_multihost_fixture
@ -46,6 +47,14 @@ def pytest_addoption(parser):
help="Directory to store integration test logs in.")
def _get_logname_from_node(node):
name = node.nodeid
name = re.sub('\(\)/', '', name) # remove ()/
name = re.sub('[()]', '', name) # and standalone brackets
name = re.sub('(/|::)', '-', name)
return name
def collect_test_logs(node, logs_dict, test_config):
"""Collect logs from a test
@ -56,7 +65,7 @@ def collect_test_logs(node, logs_dict, test_config):
:param test_config: Pytest configuration
"""
collect_logs(
name=node.nodeid.replace('/', '-').replace('::', '-'),
name=_get_logname_from_node(node),
logs_dict=logs_dict,
logfile_dir=test_config.getoption('logfile_dir'),
beakerlib_plugin=test_config.pluginmanager.getplugin('BeakerLibPlugin'),