summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2018-07-17 12:04:35 -0700
committerDylan Baker <dylan@pnwbakers.com>2018-07-26 10:35:44 -0700
commitba066f048f6329eb8c765d43670dc87328682d90 (patch)
treefbef9bc507d65d5b727267d75afe990250884e6a /tests
parent55dc0791df3ce268e0ff53c49f9d81cd0bd93aae (diff)
commands/globals: Use asyncio coroutines instead of twisted deferreds
Diffstat (limited to 'tests')
-rw-r--r--tests/commands/global_test.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/commands/global_test.py b/tests/commands/global_test.py
index b0153a45..b0e52913 100644
--- a/tests/commands/global_test.py
+++ b/tests/commands/global_test.py
@@ -20,7 +20,7 @@ import os
import tempfile
from twisted.trial import unittest
-from twisted.internet.defer import inlineCallbacks
+from twisted.internet.defer import inlineCallbacks, ensureDeferred
import mock
from alot.commands import globals as g_commands
@@ -70,7 +70,7 @@ class TestComposeCommand(unittest.TestCase):
with mock.patch('alot.commands.globals.settings.get_addressbooks',
mock.Mock(side_effect=Stop)):
try:
- yield cmd.apply(mock.Mock())
+ yield ensureDeferred(cmd.apply(mock.Mock()))
except Stop:
pass
@@ -92,7 +92,7 @@ class TestComposeCommand(unittest.TestCase):
with mock.patch('alot.commands.globals.settings.get_addressbooks',
mock.Mock(side_effect=Stop)):
try:
- yield cmd.apply(mock.Mock())
+ yield ensureDeferred(cmd.apply(mock.Mock()))
except Stop:
pass
@@ -114,7 +114,7 @@ class TestComposeCommand(unittest.TestCase):
with mock.patch('alot.commands.globals.settings.get_addressbooks',
mock.Mock(side_effect=Stop)):
try:
- yield cmd.apply(mock.Mock())
+ yield ensureDeferred(cmd.apply(mock.Mock()))
except Stop:
pass
@@ -140,7 +140,7 @@ class TestComposeCommand(unittest.TestCase):
'alot.commands.globals.settings.get_account_by_address',
mock.Mock(side_effect=Stop)):
try:
- yield cmd.apply(mock.Mock())
+ yield ensureDeferred(cmd.apply(mock.Mock()))
except Stop:
pass
@@ -168,7 +168,7 @@ class TestComposeCommand(unittest.TestCase):
with mock.patch('alot.commands.globals.settings.get_addressbooks',
mock.Mock(side_effect=Stop)):
try:
- yield cmd.apply(mock.Mock())
+ yield ensureDeferred(cmd.apply(mock.Mock()))
except Stop:
pass