IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2024-12-22 23:23:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Compatibility with pytest 3.4

Browse Source 
The nose_compat plugin uses internal pytest APIs to suspend and resume
the capture manager. In pytest 3.4, the internal APIs have changed and a
public API was added.

The fix is required to run integration tests under Fedora 28.

Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
This commit is contained in:
Christian Heimes 2018-04-30 01:37:07 +02:00
parent d5e5bd501c
commit 3c66e388de
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ipatests/pytest_plugins/nose_compat.py
View File

@ -54,11 +54,23 @@ def pytest_configure(config):
capture = config.pluginmanager.getplugin('capturemanager')
orig_stdout, orig_stderr = sys.stdout, sys.stderr
if capture:
capture._capturing.suspend_capturing()
# pylint: disable=no-member
if hasattr(capture, 'suspend_global_capture'):
# pytest >= 3.3
capture.suspend_global_capture()
else:
# legacy support for pytest <= 3.2 (Fedora 27)
capture._capturing.suspend_capturing()
# pylint: enable=no-member
sys.stderr.write(self.format(record))
sys.stderr.write('\n')
if capture:
capture._capturing.resume_capturing()
# pylint: disable=no-member
if hasattr(capture, 'resume_global_capture'):
capture.resume_global_capture()
else:
capture._capturing.resume_capturing()
# pylint: enable=no-member
sys.stdout, sys.stderr = orig_stdout, orig_stderr
level = convert_log_level(config.getoption('logging_level'))