Skip to content

Commit

Permalink
Merge branch 'main' into update_matrix_3_12
Browse files Browse the repository at this point in the history
  • Loading branch information
altendky authored Mar 18, 2024
2 parents 9073a0f + 5b1af47 commit 00b3b1d
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion testing/test_basic.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 00b3b1d

Please sign in to comment.