mirror of https://github.com/ansible/ansible.git
apt_key: add --recv argument as last one (#74949)
* apt_key: add --recv argument as last one * Add unit test * Add the required boilerplate Co-authored-by: Marius Gedminas <marius@gedmin.as>pull/74928/head
parent
81ad125aa6
commit
50e998e303
@ -0,0 +1,2 @@
|
||||
bugfixes:
|
||||
- apt_key - set --recv argument as last one in apt-key command when using env var HTTP_PROXY (https://github.com/ansible/ansible/issues/74946)
|
@ -0,0 +1,27 @@
|
||||
from __future__ import (absolute_import, division, print_function)
|
||||
__metaclass__ = type
|
||||
|
||||
import os
|
||||
|
||||
from units.compat import mock
|
||||
from units.compat import unittest
|
||||
|
||||
from ansible.modules import apt_key
|
||||
|
||||
|
||||
class AptKeyTestCase(unittest.TestCase):
|
||||
|
||||
@mock.patch.object(apt_key, 'apt_key_bin', '/usr/bin/apt-key')
|
||||
@mock.patch.dict(os.environ, {'HTTP_PROXY': 'proxy.example.com'})
|
||||
def test_import_key_with_http_proxy(self):
|
||||
m_mock = mock.Mock()
|
||||
m_mock.run_command.return_value = (0, '', '')
|
||||
apt_key.import_key(
|
||||
m_mock, keyring=None, keyserver='keyserver.example.com',
|
||||
key_id='0xDEADBEEF')
|
||||
self.assertEqual(
|
||||
m_mock.run_command.call_args_list[0][0][0],
|
||||
'/usr/bin/apt-key adv --no-tty --keyserver keyserver.example.com'
|
||||
' --keyserver-options http-proxy=proxy.example.com'
|
||||
' --recv 0xDEADBEEF'
|
||||
)
|
Loading…
Reference in New Issue