From 45954d340d79d0afd4e40195a4dbf4df66ae087c Mon Sep 17 00:00:00 2001
From: Kyle Altendorf <sda@fstab.net>
Date: Mon, 30 Mar 2020 00:14:53 -0400
Subject: [PATCH 1/3] add test for #93 relating to scrapy and pytest 5.4.0

pytest-dev/pytest-twisted#93
---
 testing/test_basic.py | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/testing/test_basic.py b/testing/test_basic.py
index 9afbc4c..9ddbd71 100755
--- a/testing/test_basic.py
+++ b/testing/test_basic.py
@@ -696,3 +696,34 @@ def test_succeed():
     testdir.makepyfile(test_file)
     rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts)
     assert "WrongReactorAlreadyInstalledError" in rr.stderr.str()
+
+
+def test_scrapy____something(testdir, cmd_opts):
+    test_file = """
+    import sys
+
+    import twisted.internet.reactor
+    import twisted.internet.defer
+    import twisted.internet.protocol
+    import twisted.trial.unittest
+
+
+    class Protocol(twisted.internet.protocol.ProcessProtocol):
+        def __init__(self):
+            self.deferred = twisted.internet.defer.Deferred()
+
+        def processEnded(self, status):
+            self.deferred.callback(self)
+
+
+    class Test(twisted.trial.unittest.TestCase):
+        @twisted.internet.defer.inlineCallbacks
+        def test(self):
+            protocol = Protocol()
+            command = [sys.executable, '--version']
+            twisted.internet.reactor.spawnProcess(protocol, command[0], command)
+            yield protocol.deferred
+    """
+    testdir.makepyfile(test_file)
+    rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts)
+    assert_outcomes(rr, {"passed": 1})

From b0143766ddbd2272c0a9541fb48f9b087c38155c Mon Sep 17 00:00:00 2001
From: Kyle Altendorf <sda@fstab.net>
Date: Mon, 30 Mar 2020 13:56:10 -0400
Subject: [PATCH 2/3] formatting...

---
 testing/test_basic.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/testing/test_basic.py b/testing/test_basic.py
index 9ddbd71..7e4f61a 100755
--- a/testing/test_basic.py
+++ b/testing/test_basic.py
@@ -721,7 +721,13 @@ class Test(twisted.trial.unittest.TestCase):
         def test(self):
             protocol = Protocol()
             command = [sys.executable, '--version']
-            twisted.internet.reactor.spawnProcess(protocol, command[0], command)
+
+            twisted.internet.reactor.spawnProcess(
+                protocol,
+                command[0],
+                command,
+            )
+
             yield protocol.deferred
     """
     testdir.makepyfile(test_file)

From 84655ec84cafa46f83a08b2a4083086d10695f9a Mon Sep 17 00:00:00 2001
From: Kyle Altendorf <sda@fstab.net>
Date: Thu, 11 Jun 2020 15:00:18 -0400
Subject: [PATCH 3/3] Catchup testdir usage

---
 testing/test_basic.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing/test_basic.py b/testing/test_basic.py
index a671724..272617e 100755
--- a/testing/test_basic.py
+++ b/testing/test_basic.py
@@ -947,5 +947,5 @@ def test(self):
             yield protocol.deferred
     """
     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})