more tidying

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
 

testing/test_basic.py

@@ -96,6 +96,9 @@ def test_inline_callbacks_in_pytest():
     assert hasattr(pytest, 'inlineCallbacks')
 
 
+run_args = [sys.executable, "-m", "pytest", "-v"]
+
+
 @pytest.mark.parametrize(
     'decorator, should_warn',
     (
@@ -119,7 +122,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, timeout=timeout)
+    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
 
     expected_outcomes = {"passed": 1}
     if should_warn:
@@ -163,7 +166,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, timeout=timeout)
+    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
 
     expected_outcomes = {"passed": 1}
     if should_warn:
@@ -188,7 +191,7 @@ def doit():
         return d
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", *cmd_opts, timeout=timeout)
+    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"failed": 1})
 
 
@@ -202,7 +205,7 @@ def test_succeed():
         return d
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", *cmd_opts, timeout=timeout)
+    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 1})
 
 
@@ -214,7 +217,7 @@ def test_succeed():
         return 42
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", *cmd_opts, timeout=timeout)
+    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 1})
 
 
@@ -224,7 +227,7 @@ def test_more_fail():
         raise RuntimeError("foo")
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", *cmd_opts, timeout=timeout)
+    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"failed": 1})
 
 
@@ -245,7 +248,7 @@ def test_succeed(foo):
             raise RuntimeError("baz")
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts, timeout=timeout)
+    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 2, "failed": 1})
 
 
@@ -267,7 +270,7 @@ async def test_succeed(foo):
             raise RuntimeError("baz")
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts, timeout=timeout)
+    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 2, "failed": 1})
 
 
@@ -287,7 +290,7 @@ def test_MAIN():
         assert MAIN is greenlet.getcurrent()
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts, timeout=timeout)
+    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 1})
 
 
@@ -312,7 +315,7 @@ def test_succeed(foo):
             raise RuntimeError("baz")
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts, timeout=timeout)
+    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 2, "failed": 1})
 
 
@@ -338,7 +341,7 @@ async def test_succeed(foo):
             raise RuntimeError("baz")
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts, timeout=timeout)
+    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 2, "failed": 1})
 
 
@@ -374,7 +377,7 @@ def test_succeed_blue(foo):
             raise RuntimeError("baz")
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts, timeout=timeout)
+    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 2, "failed": 1})
 
 
@@ -411,7 +414,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, timeout=timeout)
+    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 1})
 
 
@@ -450,7 +453,7 @@ def test_succeed(foo):
             raise RuntimeError("baz")
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts, timeout=timeout)
+    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
     # TODO: this is getting super imprecise...
     assert_outcomes(rr, {"passed": 4, "failed": 1, "errors": 2})
 
@@ -499,7 +502,7 @@ def test_second(foo):
         check_me = 2
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts, timeout=timeout)
+    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 2})
 
 
@@ -528,7 +531,7 @@ async def test_doublefour(doublefour):
         assert doublefour == 8
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts, timeout=timeout)
+    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 2})
 
 
@@ -557,7 +560,7 @@ async def test_doublefour(doublefour):
         assert doublefour == 8
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts, timeout=timeout)
+    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 2})
 
 
@@ -604,7 +607,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, timeout=timeout)
+    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 2})
     # assert_outcomes(rr, {"passed": 1})
 
@@ -652,7 +655,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, timeout=timeout)
+    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 2})
 
 
@@ -680,7 +683,7 @@ def test_succeed():
         return d
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts, timeout=timeout)
+    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 1})
 
 
@@ -697,7 +700,7 @@ def test_succeed():
         pass
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts, timeout=timeout)
+    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
     assert "WrongReactorAlreadyInstalledError" in rr.stderr.str()
 
 
@@ -726,7 +729,7 @@ def test_succeed():
         return d
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts, timeout=timeout)
+    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 1})
 
 
@@ -743,7 +746,7 @@ def test_succeed():
         pass
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts, timeout=timeout)
+    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
     assert "WrongReactorAlreadyInstalledError" in rr.stderr.str()
 
 
@@ -795,7 +798,7 @@ def main():
     """
     testdir.makepyfile(runner=runner_file)
     # check test file is ok in standalone mode:
-    rr = testdir.run(sys.executable, "-m", "pytest", "-v", timeout=timeout)
+    rr = testdir.run(*run_args, timeout=timeout)
     assert_outcomes(rr, {"passed": 1, "failed": 1})
     # test embedded mode:
     assert testdir.run(sys.executable, "runner.py", timeout=timeout).ret == 0
@@ -830,7 +833,7 @@ def test_succeed():
         return d
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts, timeout=timeout)
+    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 1})
 
 
@@ -855,7 +858,7 @@ def test_succeed():
         pass
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts, timeout=timeout)
+    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
     assert "WrongReactorAlreadyInstalledError" in rr.stderr.str()
 
 
@@ -903,5 +906,5 @@ def test_second(foo):
         check_me = 3
     """
     testdir.makepyfile(test_file)
-    rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts, timeout=timeout)
+    rr = testdir.run(*run_args, *cmd_opts, timeout=timeout)
     assert_outcomes(rr, {"passed": 2})