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: Remove no longer needed 'capture' compatibility

Browse Source 
Since the required Pytest is 3.9.1+, old Pytest compat code can
be removed.

Fixes: https://pagure.io/freeipa/issue/8101
Signed-off-by: Stanislav Levin <slev@altlinux.org>
Reviewed-By: Sergey Orlov <sorlov@redhat.com>
This commit is contained in:
Stanislav Levin 2020-04-13 19:40:17 +03:00 committed by Sergey Orlov
parent be6ac7d4c9
commit f6b088effd
No known key found for this signature in database
GPG Key ID: ADF8C90EDD04503D
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ipatests/pytest_ipa/nose_compat.py
View File

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