diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-06-10 13:22:59 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-06-10 13:22:59 -0400 |
| commit | 7e527b1b2f3fda558fb0f3a6958c42dde4716079 (patch) | |
| tree | e4d78e18b8fbae975ac5d1ec78a67af845b2c650 /tests/unittests/test_handler/test_handler_apt_source.py | |
| parent | 0e734b63c64c5534813d7647d33870c9fc3d3a0c (diff) | |
| download | vyos-cloud-init-7e527b1b2f3fda558fb0f3a6958c42dde4716079.tar.gz vyos-cloud-init-7e527b1b2f3fda558fb0f3a6958c42dde4716079.zip | |
minor changes prior to merge
a.) remove 'gpg_' from function names in new gpg module.
b.) use --recv-keys rather than --recv
--recv-keys is more obvious and works back to precise at least.
c.) do not trim trailing '\n' from a armour'd key.
Diffstat (limited to 'tests/unittests/test_handler/test_handler_apt_source.py')
| -rw-r--r-- | tests/unittests/test_handler/test_handler_apt_source.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/unittests/test_handler/test_handler_apt_source.py b/tests/unittests/test_handler/test_handler_apt_source.py index 5b52f709..99a4d860 100644 --- a/tests/unittests/test_handler/test_handler_apt_source.py +++ b/tests/unittests/test_handler/test_handler_apt_source.py @@ -13,8 +13,8 @@ except ImportError: from mock import call from cloudinit.config import cc_apt_configure -from cloudinit import util from cloudinit import gpg +from cloudinit import util from ..helpers import TestCase @@ -405,7 +405,7 @@ class TestAptSourceConfig(TestCase): params = self._get_default_params() with mock.patch.object(cc_apt_configure, 'add_apt_key_raw') as mockkey: - with mock.patch.object(gpg, 'gpg_getkeybyid', + with mock.patch.object(gpg, 'get_key_by_id', return_value=expectedkey) as mockgetkey: cc_apt_configure.add_apt_sources([cfg], params) |