Skip to content

Commit aaff1ad

Browse files
committed
ensureDeferred -> async_await
A couple bike sheds later, another name thrash emerges
1 parent 11c8ab2 commit aaff1ad

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

README.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,13 @@ functions, which take funcargs, does not work. Please use
6262
assert res == []
6363

6464

65-
ensureDeferred
65+
async_await
6666
=================
6767
Using ``twisted.internet.defer.ensureDeferred`` as a decorator for test
6868
functions, which take funcargs, does not work. Please use
69-
``pytest_twisted.ensureDeferred`` instead::
69+
``pytest_twisted.async_await`` instead::
7070

71-
@pytest_twisted.ensureDeferred
71+
@pytest_twisted.async_await
7272
async def test_some_stuff(tmpdir):
7373
res = await threads.deferToThread(os.listdir, tmpdir.strpath)
7474
assert res == []

pytest_twisted.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class _instances:
2929
def pytest_namespace():
3030
return {
3131
"inlineCallbacks": inlineCallbacks,
32-
"ensureDeferred": ensureDeferred,
32+
"async_await": async_await,
3333
"blockon": blockon,
3434
}
3535

@@ -74,7 +74,7 @@ def inlineCallbacks(fun, *args, **kw):
7474

7575

7676
@decorator.decorator
77-
def ensureDeferred(fun, *args, **kw):
77+
def async_await(fun, *args, **kw):
7878
return defer.ensureDeferred(fun(*args, **kw))
7979

8080

testing/test_basic.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ def test_succeed(foo):
130130

131131

132132
@skip_if_no_async_await()
133-
def test_ensureDeferred(testdir, cmd_opts):
133+
def test_async_await(testdir, cmd_opts):
134134
test_file = """
135135
from twisted.internet import reactor, defer
136136
import pytest
@@ -140,7 +140,7 @@ def test_ensureDeferred(testdir, cmd_opts):
140140
def foo(request):
141141
return request.param
142142
143-
@pytest_twisted.ensureDeferred
143+
@pytest_twisted.async_await
144144
async def test_succeed(foo):
145145
await defer.succeed(foo)
146146
if foo == "web":
@@ -211,7 +211,7 @@ def foo(request):
211211
pytest_twisted.blockon(d1)
212212
return d2
213213
214-
@pytest_twisted.ensureDeferred
214+
@pytest_twisted.async_await
215215
async def test_succeed(foo):
216216
x = await foo
217217
if x == "web":

0 commit comments

Comments
 (0)