Merge branch 'main' into update_matrix_3_12

altendky · web-flow · commit 00b3b1df3527 · 2024-03-18T10:12:47.000-04:00
diff --git a/testing/test_basic.py b/testing/test_basic.py
@@ -396,7 +396,6 @@ def test_async_fixture(testdir, cmd_opts):
         scope="function",
         params=["fs", "imap", "web"],
     )
-    @pytest.mark.redgreenblue
     async def foo(request):
         d1, d2 = defer.Deferred(), defer.Deferred()
         reactor.callLater(0.01, d1.callback, 1)

Original file line number	Diff line number	Diff line change
`@@ -396,7 +396,6 @@ def test_async_fixture(testdir, cmd_opts):`
`396`	`396`	`scope="function",`
`397`	`397`	`params=["fs", "imap", "web"],`
`398`	`398`	`)`
`399`		`- @pytest.mark.redgreenblue`
`400`	`399`	`async def foo(request):`
`401`	`400`	`d1, d2 = defer.Deferred(), defer.Deferred()`
`402`	`401`	`reactor.callLater(0.01, d1.callback, 1)`