From 55dc0791df3ce268e0ff53c49f9d81cd0bd93aae Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Tue, 17 Jul 2018 11:38:20 -0700 Subject: command/envelope: use asyncio coroutines instead of twisted inlineCallbacks --- tests/commands/envelope_test.py | 6 +++--- tests/commands/utils_tests.py | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 14 deletions(-) (limited to 'tests') diff --git a/tests/commands/envelope_test.py b/tests/commands/envelope_test.py index 5f69ae43..d3908be8 100644 --- a/tests/commands/envelope_test.py +++ b/tests/commands/envelope_test.py @@ -22,7 +22,7 @@ import tempfile import textwrap from twisted.trial import unittest -from twisted.internet.defer import inlineCallbacks +from twisted.internet.defer import inlineCallbacks, ensureDeferred import mock @@ -360,7 +360,7 @@ class TestSendCommand(unittest.TestCase): with mock.patch( 'alot.commands.envelope.settings.get_account_by_address', mock.Mock(return_value=account)) as get_account_by_address: - yield cmd.apply(mock.Mock()) + yield ensureDeferred(cmd.apply(mock.Mock())) get_account_by_address.assert_called_once_with('foo@example.com', return_default=True) # check that the apply did run through till the end. @@ -374,7 +374,7 @@ class TestSendCommand(unittest.TestCase): with mock.patch( 'alot.commands.envelope.settings.get_account_by_address', mock.Mock(return_value=account)) as get_account_by_address: - yield cmd.apply(mock.Mock()) + yield ensureDeferred(cmd.apply(mock.Mock())) get_account_by_address.assert_called_once_with('foo@example.com', return_default=True) # check that the apply did run through till the end. diff --git a/tests/commands/utils_tests.py b/tests/commands/utils_tests.py index db304552..bce85c14 100644 --- a/tests/commands/utils_tests.py +++ b/tests/commands/utils_tests.py @@ -21,7 +21,7 @@ import shutil import gpg import mock from twisted.trial import unittest -from twisted.internet.defer import inlineCallbacks +from twisted.internet.defer import inlineCallbacks, ensureDeferred from alot import crypto from alot import errors @@ -80,7 +80,7 @@ class TestGetKeys(unittest.TestCase): signed_only=False) ui = utilities.make_ui() ids = [FPR] - actual = yield utils._get_keys(ui, ids) + actual = yield ensureDeferred(utils._get_keys(ui, ids)) self.assertIn(FPR, actual) self.assertEqual(actual[FPR].fpr, expected.fpr) @@ -91,7 +91,7 @@ class TestGetKeys(unittest.TestCase): signed_only=False) ui = utilities.make_ui() ids = [FPR, "6F6B15509CF8E59E6E469F327F438280EF8D349F"] - actual = yield utils._get_keys(ui, ids) + actual = yield ensureDeferred(utils._get_keys(ui, ids)) self.assertIn(FPR, actual) self.assertEqual(actual[FPR].fpr, expected.fpr) @@ -100,7 +100,7 @@ class TestGetKeys(unittest.TestCase): """Test gettings keys when signed only is required.""" ui = utilities.make_ui() ids = [FPR] - actual = yield utils._get_keys(ui, ids, signed_only=True) + actual = yield ensureDeferred(utils._get_keys(ui, ids, signed_only=True)) self.assertEqual(actual, {}) @inlineCallbacks @@ -123,7 +123,7 @@ class TestGetKeys(unittest.TestCase): 'test', errors.GPGCode.AMBIGUOUS_NAME))): with mock.patch('alot.commands.utils.crypto.list_keys', mock.Mock(return_value=[key])): - yield utils._get_keys(ui, ids, signed_only=False) + yield ensureDeferred(utils._get_keys(ui, ids, signed_only=False)) ui.choice.assert_called_once() @@ -140,7 +140,7 @@ class TestSetEncrypt(unittest.TestCase): ui = utilities.make_ui() envelope = Envelope() envelope['To'] = 'ambig@example.com, test@example.com' - yield utils.update_keys(ui, envelope) + yield ensureDeferred(utils.update_keys(ui, envelope)) self.assertTrue(envelope.encrypt) self.assertCountEqual( [f.fpr for f in envelope.encrypt_keys.values()], @@ -151,7 +151,7 @@ class TestSetEncrypt(unittest.TestCase): ui = utilities.make_ui() envelope = Envelope() envelope['Cc'] = 'ambig@example.com, test@example.com' - yield utils.update_keys(ui, envelope) + yield ensureDeferred(utils.update_keys(ui, envelope)) self.assertTrue(envelope.encrypt) self.assertCountEqual( [f.fpr for f in envelope.encrypt_keys.values()], @@ -162,7 +162,7 @@ class TestSetEncrypt(unittest.TestCase): ui = utilities.make_ui() envelope = Envelope() envelope['Cc'] = 'foo@example.com, test@example.com' - yield utils.update_keys(ui, envelope) + yield ensureDeferred(utils.update_keys(ui, envelope)) self.assertTrue(envelope.encrypt) self.assertCountEqual( [f.fpr for f in envelope.encrypt_keys.values()], @@ -173,7 +173,7 @@ class TestSetEncrypt(unittest.TestCase): ui = utilities.make_ui() envelope = Envelope() envelope['To'] = 'foo@example.com' - yield utils.update_keys(ui, envelope) + yield ensureDeferred(utils.update_keys(ui, envelope)) self.assertFalse(envelope.encrypt) self.assertEqual(envelope.encrypt_keys, {}) @@ -187,7 +187,7 @@ class TestSetEncrypt(unittest.TestCase): account = _Account(encrypt_to_self=True, gpg_key=gpg_key) with mock.patch('alot.commands.thread.settings.get_account_by_address', mock.Mock(return_value=account)): - yield utils.update_keys(ui, envelope) + yield ensureDeferred(utils.update_keys(ui, envelope)) self.assertTrue(envelope.encrypt) self.assertIn(FPR, envelope.encrypt_keys) self.assertEqual(gpg_key, envelope.encrypt_keys[FPR]) @@ -202,6 +202,6 @@ class TestSetEncrypt(unittest.TestCase): account = _Account(encrypt_to_self=False, gpg_key=gpg_key) with mock.patch('alot.commands.thread.settings.get_account_by_address', mock.Mock(return_value=account)): - yield utils.update_keys(ui, envelope) + yield ensureDeferred(utils.update_keys(ui, envelope)) self.assertTrue(envelope.encrypt) self.assertNotIn(FPR, envelope.encrypt_keys) -- cgit v1.2.3