Merge branch 'master' into pypy

Author: altendky

pytest_twisted.py

@@ -7,7 +7,8 @@
 import greenlet
 import pytest
 
-from twisted.internet import error, defer
+from twisted.internet import defer
+# from twisted.internet import error
 from twisted.internet.threads import blockingCallFromThread
 from twisted.python import failure
 
@@ -400,9 +401,14 @@ def init_asyncio_reactor():
 
 def _install_reactor(reactor_installer, reactor_type):
     """Install the specified reactor and create the greenlet."""
-    try:
+    # TODO: maybe fix this in qt5reactor?  btw, it avoids creating a second
+    #       qt5reactor.core.QtEventReactor and this somehow fixes the hang
+    #       that showed up in 5.15.0.
+    # try:
+    if 'twisted.internet.reactor' not in sys.modules:
         reactor_installer()
-    except error.ReactorAlreadyInstalledError:
+    # except error.ReactorAlreadyInstalledError:
+    else:
         import twisted.internet.reactor
 
         if not isinstance(twisted.internet.reactor, reactor_type):

testing/test_basic.py

@@ -10,6 +10,8 @@
 # https://docs.python.org/3/whatsnew/3.6.html#pep-525-asynchronous-generators
 ASYNC_GENERATORS = sys.version_info >= (3, 6)
 
+timeout = 15
+
 
 # https://github.com/pytest-dev/pytest/issues/6505
 def force_plural(name):
@@ -87,7 +89,13 @@ def skip_if_no_async_generators():
 @pytest.fixture
 def cmd_opts(request):
     reactor = request.config.getoption("reactor", "default")
-    return ("--reactor={}".format(reactor),)
+    return (
+        sys.executable,
+        "-m",
+        "pytest",
+        "-v",
+        "--reactor={}".format(reactor),
+    )
 
 
 def test_inline_callbacks_in_pytest():
@@ -117,7 +125,7 @@ def f():
             yield 42
     """.format(import_path=import_path, decorator=decorator)
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
 
     expected_outcomes = {"passed": 1}
     if should_warn:
@@ -161,7 +169,7 @@ def test_succeed(foo):
         pass
     """.format(import_path=import_path, function=function)
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
 
     expected_outcomes = {"passed": 1}
     if should_warn:
@@ -186,7 +194,7 @@ def doit():
         return d
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", *cmd_opts)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"failed": 1})
 
 
@@ -200,7 +208,7 @@ def test_succeed():
         return d
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", *cmd_opts)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 1})
 
 
@@ -212,7 +220,7 @@ def test_succeed():
         return 42
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", *cmd_opts)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 1})
 
 
@@ -222,7 +230,7 @@ def test_more_fail():
         raise RuntimeError("foo")
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", *cmd_opts)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"failed": 1})
 
 
@@ -243,7 +251,7 @@ def test_succeed(foo):
             raise RuntimeError("baz")
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 2, "failed": 1})
 
 
@@ -265,7 +273,7 @@ async def test_succeed(foo):
             raise RuntimeError("baz")
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 2, "failed": 1})
 
 
@@ -285,7 +293,7 @@ def test_MAIN():
         assert MAIN is greenlet.getcurrent()
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 1})
 
 
@@ -310,7 +318,7 @@ def test_succeed(foo):
             raise RuntimeError("baz")
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 2, "failed": 1})
 
 
@@ -336,7 +344,7 @@ async def test_succeed(foo):
             raise RuntimeError("baz")
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 2, "failed": 1})
 
 
@@ -372,7 +380,7 @@ def test_succeed_blue(foo):
             raise RuntimeError("baz")
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 2, "failed": 1})
 
 
@@ -409,7 +417,7 @@ def test_succeed(this, that):
     testdir.makepyfile(test_file)
     # TODO: add a timeout, failure just hangs indefinitely for now
     # https://github.com/pytest-dev/pytest/issues/4073
-    rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 1})
 
 
@@ -448,7 +456,7 @@ def test_succeed(foo):
             raise RuntimeError("baz")
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     # TODO: this is getting super imprecise...
     assert_outcomes(rr, {"passed": 4, "failed": 1, "errors": 2})
 
@@ -497,7 +505,7 @@ def test_second(foo):
         check_me = 2
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 2})
 
 
@@ -526,7 +534,7 @@ async def test_doublefour(doublefour):
         assert doublefour == 8
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 2})
 
 
@@ -555,7 +563,7 @@ async def test_doublefour(doublefour):
         assert doublefour == 8
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 2})
 
 
@@ -602,7 +610,7 @@ async def test_doubleincrement(doubleincrement):
         assert (first, second) == (0, 2)
     """.format(maybe_async=maybe_async, maybe_await=maybe_await)
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 2})
     # assert_outcomes(rr, {"passed": 1})
 
@@ -650,7 +658,7 @@ async def test_doubleincrement(doubleincrement):
         assert (first, second) == (0, 2)
     """.format(maybe_async=maybe_async, maybe_await=maybe_await)
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 2})
 
 
@@ -678,7 +686,7 @@ def test_succeed():
         return d
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 1})
 
 
@@ -695,7 +703,7 @@ def test_succeed():
         pass
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert "WrongReactorAlreadyInstalledError" in rr.stderr.str()
 
 
@@ -725,7 +733,7 @@ def test_succeed():
         return d
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 1})
 
 
@@ -742,11 +750,11 @@ def test_succeed():
         pass
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert "WrongReactorAlreadyInstalledError" in rr.stderr.str()
 
 
-def test_pytest_from_reactor_thread(testdir, request):
+def test_pytest_from_reactor_thread(testdir, cmd_opts, request):
     skip_if_reactor_not(request, "default")
     test_file = """
     import pytest
@@ -794,10 +802,10 @@ def main():
     """
     testdir.makepyfile(runner=runner_file)
     # check test file is ok in standalone mode:
-    rr = testdir.run(sys.executable, "-m", "pytest", "-v")
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 1, "failed": 1})
     # test embedded mode:
-    assert testdir.run(sys.executable, "runner.py").ret == 0
+    assert testdir.run(sys.executable, "runner.py", timeout=timeout).ret == 0
 
 
 def test_blockon_in_hook_with_asyncio(testdir, cmd_opts, request):
@@ -829,7 +837,7 @@ def test_succeed():
         return d
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 1})
 
 
@@ -854,7 +862,7 @@ def test_succeed():
         pass
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert "WrongReactorAlreadyInstalledError" in rr.stderr.str()
 
 
@@ -902,5 +910,5 @@ def test_second(foo):
         check_me = 3
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 2})