maybe

Author: altendky

testing/test_basic.py

@@ -89,16 +89,19 @@ 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():
     assert hasattr(pytest, 'inlineCallbacks')
 
 
-run_args = [sys.executable, "-m", "pytest", "-v"]
-
-
 @pytest.mark.parametrize(
     'decorator, should_warn',
     (
@@ -122,7 +125,7 @@ def f():
             yield 42
     """.format(import_path=import_path, decorator=decorator)
     testdir.makepyfile(test_file)
-    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
 
     expected_outcomes = {"passed": 1}
     if should_warn:
@@ -166,7 +169,7 @@ def test_succeed(foo):
         pass
     """.format(import_path=import_path, function=function)
     testdir.makepyfile(test_file)
-    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
 
     expected_outcomes = {"passed": 1}
     if should_warn:
@@ -191,7 +194,7 @@ def doit():
         return d
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"failed": 1})
 
 
@@ -205,7 +208,7 @@ def test_succeed():
         return d
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 1})
 
 
@@ -217,7 +220,7 @@ def test_succeed():
         return 42
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 1})
 
 
@@ -227,7 +230,7 @@ def test_more_fail():
         raise RuntimeError("foo")
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"failed": 1})
 
 
@@ -248,7 +251,7 @@ def test_succeed(foo):
             raise RuntimeError("baz")
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 2, "failed": 1})
 
 
@@ -270,7 +273,7 @@ async def test_succeed(foo):
             raise RuntimeError("baz")
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 2, "failed": 1})
 
 
@@ -290,7 +293,7 @@ def test_MAIN():
         assert MAIN is greenlet.getcurrent()
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 1})
 
 
@@ -315,7 +318,7 @@ def test_succeed(foo):
             raise RuntimeError("baz")
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 2, "failed": 1})
 
 
@@ -341,7 +344,7 @@ async def test_succeed(foo):
             raise RuntimeError("baz")
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 2, "failed": 1})
 
 
@@ -377,7 +380,7 @@ def test_succeed_blue(foo):
             raise RuntimeError("baz")
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 2, "failed": 1})
 
 
@@ -414,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(*run_args, *cmd_opts, timeout=timeout)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 1})
 
 
@@ -453,7 +456,7 @@ def test_succeed(foo):
             raise RuntimeError("baz")
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     # TODO: this is getting super imprecise...
     assert_outcomes(rr, {"passed": 4, "failed": 1, "errors": 2})
 
@@ -502,7 +505,7 @@ def test_second(foo):
         check_me = 2
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 2})
 
 
@@ -531,7 +534,7 @@ async def test_doublefour(doublefour):
         assert doublefour == 8
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 2})
 
 
@@ -560,7 +563,7 @@ async def test_doublefour(doublefour):
         assert doublefour == 8
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 2})
 
 
@@ -607,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(*run_args, *cmd_opts, timeout=timeout)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 2})
     # assert_outcomes(rr, {"passed": 1})
 
@@ -655,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(*run_args, *cmd_opts, timeout=timeout)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 2})
 
 
@@ -683,7 +686,7 @@ def test_succeed():
         return d
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 1})
 
 
@@ -700,14 +703,15 @@ def test_succeed():
         pass
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert "WrongReactorAlreadyInstalledError" in rr.stderr.str()
 
 
 def test_blockon_in_hook_with_qt5reactor(testdir, cmd_opts, request):
     skip_if_reactor_not(request, "qt5reactor")
     conftest_file = """
     import pytest_twisted as pt
+    import pytestqt
     from twisted.internet import defer
 
     def pytest_configure(config):
@@ -729,7 +733,7 @@ def test_succeed():
         return d
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 1})
 
 
@@ -746,11 +750,11 @@ def test_succeed():
         pass
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
+    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
@@ -798,7 +802,7 @@ def main():
     """
     testdir.makepyfile(runner=runner_file)
     # check test file is ok in standalone mode:
-    rr = testdir.run(*run_args, timeout=timeout)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 1, "failed": 1})
     # test embedded mode:
     assert testdir.run(sys.executable, "runner.py", timeout=timeout).ret == 0
@@ -833,7 +837,7 @@ def test_succeed():
         return d
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 1})
 
 
@@ -858,7 +862,7 @@ def test_succeed():
         pass
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert "WrongReactorAlreadyInstalledError" in rr.stderr.str()
 
 
@@ -906,5 +910,5 @@ def test_second(foo):
         check_me = 3
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 2})

tox.ini

@@ -18,10 +18,9 @@ deps=
 setenv=
     defaultreactor: REACTOR = default
     qt5reactor: REACTOR = qt5reactor
-    qt5reactor: OPTIONS = -s --no-qt-log
     asyncioreactor: REACTOR = asyncio
 commands=
-    pytest --reactor={env:REACTOR} {env:OPTIONS:}
+    pytest --reactor={env:REACTOR}
 sitepackages=False
 download=true