p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed linting.

This commit is contained in:
victor 2018-08-19 15:46:02 +02:00
parent 0564b52c0e
commit 7ea4992f16
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/_pytest/capture.py
View File

@ -14,7 +14,7 @@ from tempfile import TemporaryFile
import six import six
import pytest import pytest
from _pytest.compat import CaptureIO, dummy_context_manager from _pytest.compat import CaptureIO
patchsysdict = {0: "stdin", 1: "stdout", 2: "stderr"} patchsysdict = {0: "stdin", 1: "stdout", 2: "stderr"}
@ -759,4 +759,3 @@ def _attempt_to_close_capture_file(f):
pass pass
else: else:
f.close() f.close()

1
testing/logging/test_reporting.py
View File

@ -878,7 +878,6 @@ def test_live_logging_suspends_capture(has_capture_manager, request):
import logging import logging
import contextlib import contextlib
from functools import partial from functools import partial
from _pytest.capture import CaptureManager
from _pytest.logging import _LiveLoggingStreamHandler from _pytest.logging import _LiveLoggingStreamHandler
class MockCaptureManager: class MockCaptureManager:

6
testing/test_capture.py
View File

@ -1396,7 +1396,8 @@ def test_capture_with_live_logging(testdir):
# capture should work with live cli logging # capture should work with live cli logging
# Teardown report seems to have the capture for the whole process (setup, capture, teardown) # Teardown report seems to have the capture for the whole process (setup, capture, teardown)
testdir.makeconftest(""" testdir.makeconftest(
"""
def pytest_runtest_logreport(report): def pytest_runtest_logreport(report):
if "test_global" in report.nodeid: if "test_global" in report.nodeid:
if report.when == "teardown": if report.when == "teardown":
@ -1404,7 +1405,8 @@ def test_capture_with_live_logging(testdir):
f.write(report.caplog) f.write(report.caplog)
with open("capstdout", "w") as f: with open("capstdout", "w") as f:
f.write(report.capstdout) f.write(report.capstdout)
""") """
)
testdir.makepyfile( testdir.makepyfile(
""" """