Commit 5a252e03 authored by Jason Madden's avatar Jason Madden

Correct a path problem for lock_tests I couldn't produce locally.

parent 9d5dd4e1
......@@ -138,7 +138,7 @@ cache:
- '%LOCALAPPDATA%\pip\Cache'
build_script:
- "%PYEXE% -m pip install -U --upgrade-strategy=eager -v .[test,events,dnspython]"
- "%PYEXE% -m pip install -U --upgrade-strategy=eager .[test,events,dnspython]"
test_script:
# Run the project tests
......
......@@ -406,9 +406,6 @@ if LIBUV:
'test_httpservers.CGIHTTPServerTestCase.test_invaliduri',
'test_httpservers.CGIHTTPServerTestCase.test_issue19435',
# Sometimes raises LoopExit on CPython
'test_socket.BufferIOTest.testRecvFromIntoArray',
# Unexpected timeouts sometimes
'test_smtplib.TooLongLineTests.testLineTooLong',
'test_smtplib.GeneralTests.testTimeoutValue',
......@@ -463,6 +460,10 @@ if LIBUV:
# This test winds up hanging a long time.
# Inserting GCs doesn't fix it.
'test_ssl.ThreadedTests.test_handshake_timeout',
# These sometimes raise LoopExit, for no apparent reason.
'test_socket.BufferIOTest.testRecvFromIntoBytearray',
'test_socket.BufferIOTest.testRecvFromIntoArray',
]
if PY3:
......
......@@ -285,7 +285,7 @@ def _find_test_status(took, out):
return status, run_count, skipped_count
def run(command, **kwargs):
def run(command, **kwargs): # pylint:disable=too-many-locals
buffer_output = kwargs.pop('buffer_output', BUFFER_OUTPUT)
quiet = kwargs.pop('quiet', QUIET)
verbose = not quiet
......
......@@ -45,7 +45,7 @@ import time
import unittest
import weakref
import lock_tests
from gevent.tests import lock_tests
# A trivial mutable counter.
......
......@@ -19,7 +19,7 @@ try:
except ImportError:
_testcapi = None
import lock_tests # gevent: use local copy
from gevent.tests import lock_tests # gevent: use local copy
# A trivial mutable counter.
class Counter(object):
......
......@@ -24,7 +24,7 @@ except:
# some lib_pypy/_testcapimodule.o file is truncated
_testcapi = None
import lock_tests # gevent: use local copy
from gevent.tests import lock_tests # gevent: use local copy
# A trivial mutable counter.
class Counter(object):
......
......@@ -17,7 +17,7 @@ import weakref
import os
import subprocess
import lock_tests # gevent: use our local copy
from gevent.tests import lock_tests # gevent: use our local copy
from test import support
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment