From ada6b6678cef75e237194233536bab8ee6a6bf19 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Tue, 17 Jul 2018 21:37:47 -0700 Subject: tests/commands/utils: use utilities.async_test --- tests/commands/utils_tests.py | 69 +++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 35 deletions(-) (limited to 'tests') diff --git a/tests/commands/utils_tests.py b/tests/commands/utils_tests.py index bce85c14..f88244a5 100644 --- a/tests/commands/utils_tests.py +++ b/tests/commands/utils_tests.py @@ -1,5 +1,5 @@ # encoding=utf-8 -# Copyright © 2017 Dylan Baker +# Copyright © 2017-2018 Dylan Baker # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -21,7 +21,7 @@ import shutil import gpg import mock from twisted.trial import unittest -from twisted.internet.defer import inlineCallbacks, ensureDeferred +from twisted.internet.defer import inlineCallbacks from alot import crypto from alot import errors @@ -73,38 +73,38 @@ class TestGetKeys(unittest.TestCase): # pylint: disable=protected-access - @inlineCallbacks - def test_get_keys(self): + @utilities.async_test + async def test_get_keys(self): """Test that getting keys works when all keys are present.""" expected = crypto.get_key(FPR, validate=True, encrypt=True, signed_only=False) ui = utilities.make_ui() ids = [FPR] - actual = yield ensureDeferred(utils._get_keys(ui, ids)) + actual = await utils._get_keys(ui, ids) self.assertIn(FPR, actual) self.assertEqual(actual[FPR].fpr, expected.fpr) - @inlineCallbacks - def test_get_keys_missing(self): + @utilities.async_test + async def test_get_keys_missing(self): """Test that getting keys works when some keys are missing.""" expected = crypto.get_key(FPR, validate=True, encrypt=True, signed_only=False) ui = utilities.make_ui() ids = [FPR, "6F6B15509CF8E59E6E469F327F438280EF8D349F"] - actual = yield ensureDeferred(utils._get_keys(ui, ids)) + actual = await utils._get_keys(ui, ids) self.assertIn(FPR, actual) self.assertEqual(actual[FPR].fpr, expected.fpr) - @inlineCallbacks - def test_get_keys_signed_only(self): + @utilities.async_test + async def test_get_keys_signed_only(self): """Test gettings keys when signed only is required.""" ui = utilities.make_ui() ids = [FPR] - actual = yield ensureDeferred(utils._get_keys(ui, ids, signed_only=True)) + actual = await utils._get_keys(ui, ids, signed_only=True) self.assertEqual(actual, {}) - @inlineCallbacks - def test_get_keys_ambiguous(self): + @utilities.async_test + async def test_get_keys_ambiguous(self): """Test gettings keys when when the key is ambiguous.""" key = crypto.get_key( FPR, validate=True, encrypt=True, signed_only=False) @@ -112,9 +112,8 @@ class TestGetKeys(unittest.TestCase): # Creat a ui.choice object that can satisfy twisted, but can also be # queried for calls as a mock - @inlineCallbacks - def choice(*args, **kwargs): - yield None + async def choice(*args, **kwargs): + return None ui.choice = mock.Mock(wraps=choice) ids = [FPR] @@ -123,7 +122,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 ensureDeferred(utils._get_keys(ui, ids, signed_only=False)) + await utils._get_keys(ui, ids, signed_only=False) ui.choice.assert_called_once() @@ -135,50 +134,50 @@ class _Account(object): class TestSetEncrypt(unittest.TestCase): - @inlineCallbacks - def test_get_keys_from_to(self): + @utilities.async_test + async def test_get_keys_from_to(self): ui = utilities.make_ui() envelope = Envelope() envelope['To'] = 'ambig@example.com, test@example.com' - yield ensureDeferred(utils.update_keys(ui, envelope)) + await utils.update_keys(ui, envelope) self.assertTrue(envelope.encrypt) self.assertCountEqual( [f.fpr for f in envelope.encrypt_keys.values()], [crypto.get_key(FPR).fpr, crypto.get_key(EXTRA_FPRS[0]).fpr]) - @inlineCallbacks - def test_get_keys_from_cc(self): + @utilities.async_test + async def test_get_keys_from_cc(self): ui = utilities.make_ui() envelope = Envelope() envelope['Cc'] = 'ambig@example.com, test@example.com' - yield ensureDeferred(utils.update_keys(ui, envelope)) + await utils.update_keys(ui, envelope) self.assertTrue(envelope.encrypt) self.assertCountEqual( [f.fpr for f in envelope.encrypt_keys.values()], [crypto.get_key(FPR).fpr, crypto.get_key(EXTRA_FPRS[0]).fpr]) - @inlineCallbacks - def test_get_partial_keys(self): + @utilities.async_test + async def test_get_partial_keys(self): ui = utilities.make_ui() envelope = Envelope() envelope['Cc'] = 'foo@example.com, test@example.com' - yield ensureDeferred(utils.update_keys(ui, envelope)) + await utils.update_keys(ui, envelope) self.assertTrue(envelope.encrypt) self.assertCountEqual( [f.fpr for f in envelope.encrypt_keys.values()], [crypto.get_key(FPR).fpr]) - @inlineCallbacks - def test_get_no_keys(self): + @utilities.async_test + async def test_get_no_keys(self): ui = utilities.make_ui() envelope = Envelope() envelope['To'] = 'foo@example.com' - yield ensureDeferred(utils.update_keys(ui, envelope)) + await utils.update_keys(ui, envelope) self.assertFalse(envelope.encrypt) self.assertEqual(envelope.encrypt_keys, {}) - @inlineCallbacks - def test_encrypt_to_self_true(self): + @utilities.async_test + async def test_encrypt_to_self_true(self): ui = utilities.make_ui() envelope = Envelope() envelope['From'] = 'test@example.com' @@ -187,13 +186,13 @@ 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 ensureDeferred(utils.update_keys(ui, envelope)) + await utils.update_keys(ui, envelope) self.assertTrue(envelope.encrypt) self.assertIn(FPR, envelope.encrypt_keys) self.assertEqual(gpg_key, envelope.encrypt_keys[FPR]) - @inlineCallbacks - def test_encrypt_to_self_false(self): + @utilities.async_test + async def test_encrypt_to_self_false(self): ui = utilities.make_ui() envelope = Envelope() envelope['From'] = 'test@example.com' @@ -202,6 +201,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 ensureDeferred(utils.update_keys(ui, envelope)) + await utils.update_keys(ui, envelope) self.assertTrue(envelope.encrypt) self.assertNotIn(FPR, envelope.encrypt_keys) -- cgit v1.2.3