jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix lint

This commit is contained in:
Bruno Oliveira 2018-10-04 18:45:30 -03:00
parent 870a93c37b
commit fe7050ba00
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/_pytest/pytester.py
View File

@ -1065,7 +1065,7 @@ class Testdir(object):
popen = self.popen( popen = self.popen(
cmdargs, stdout=f1, stderr=f2, close_fds=(sys.platform != "win32") cmdargs, stdout=f1, stderr=f2, close_fds=(sys.platform != "win32")
) )
timeout = kwargs.get('timeout') timeout = kwargs.get("timeout")
if timeout is None: if timeout is None:
ret = popen.wait() ret = popen.wait()
elif six.PY3: elif six.PY3:

3
testing/test_pytester.py
View File

@ -3,7 +3,6 @@ from __future__ import absolute_import, division, print_function
import os import os
import py.path import py.path
import pytest import pytest
import subprocess
import sys import sys
import _pytest.pytester as pytester import _pytest.pytester as pytester
from _pytest.pytester import HookRecorder from _pytest.pytester import HookRecorder
@ -413,7 +412,7 @@ def test_testdir_run_timeout_expires(testdir):
testfile = testdir.makepyfile( testfile = testdir.makepyfile(
""" """
import time import time
def test_timeout(): def test_timeout():
time.sleep(10)""" time.sleep(10)"""
) )