archive
/
ansible
mirror of https://github.com/ansible/ansible.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove unused unit test code (#81150)

Browse Source
pull/81171/head
Matt Clay 12 months ago committed by GitHub
parent bcdb82992a
commit 8c9f5c9106
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 32 additions and 112 deletions
Show Stats Download Patch File Download Diff File

48
test/units/plugins/action/test_action.py
Unescape Escape View File

@ -269,11 +269,8 @@ class TestActionBase(unittest.TestCase):
def get_shell_opt(opt):
ret = None
if opt == 'admin_users':
ret = ['root', 'toor', 'Administrator']
elif opt == 'remote_tmp':
ret = '~/.ansible/tmp'
assert opt == 'admin_users'
ret = ['root', 'toor', 'Administrator']
return ret
@ -669,17 +666,10 @@ class TestActionBase(unittest.TestCase):
mock_task.no_log = False
# create a mock connection, so we don't actually try and connect to things
def build_module_command(env_string, shebang, cmd, arg_path=None):
to_run = [env_string, cmd]
if arg_path:
to_run.append(arg_path)
return " ".join(to_run)
def get_option(option):
return {'admin_users': ['root', 'toor']}.get(option)
mock_connection = MagicMock()
mock_connection.build_module_command.side_effect = build_module_command
mock_connection.socket_path = None
mock_connection._shell.get_remote_filename.return_value = 'copy.py'
mock_connection._shell.join_path.side_effect = os.path.join
@ -806,41 +796,7 @@ class TestActionBase(unittest.TestCase):
class TestActionBaseCleanReturnedData(unittest.TestCase):
def test(self):
fake_loader = DictDataLoader({
})
mock_module_loader = MagicMock()
mock_shared_loader_obj = MagicMock()
mock_shared_loader_obj.module_loader = mock_module_loader
connection_loader_paths = ['/tmp/asdfadf', '/usr/lib64/whatever',
'dfadfasf',
'foo.py',
'.*',
# FIXME: a path with parans breaks the regex
# '(.*)',
'/path/to/ansible/lib/ansible/plugins/connection/custom_connection.py',
'/path/to/ansible/lib/ansible/plugins/connection/ssh.py']
def fake_all(path_only=None):
for path in connection_loader_paths:
yield path
mock_connection_loader = MagicMock()
mock_connection_loader.all = fake_all
mock_shared_loader_obj.connection_loader = mock_connection_loader
mock_connection = MagicMock()
# mock_connection._shell.env_prefix.side_effect = env_prefix
# action_base = DerivedActionBase(mock_task, mock_connection, play_context, None, None, None)
action_base = DerivedActionBase(task=None,
connection=mock_connection,
play_context=None,
loader=fake_loader,
templar=None,
shared_loader_obj=mock_shared_loader_obj)
data = {'ansible_playbook_python': '/usr/bin/python',
# 'ansible_rsync_path': '/usr/bin/rsync',
'ansible_python_interpreter': '/usr/bin/python',
'ansible_ssh_some_var': 'whatever',
'ansible_ssh_host_key_somehost': 'some key here',

6
test/units/plugins/action/test_raw.py
Unescape Escape View File

@ -20,7 +20,6 @@ __metaclass__ = type
import os
from ansible.errors import AnsibleActionFail
from units.compat import unittest
from unittest.mock import MagicMock, Mock
from ansible.plugins.action.raw import ActionModule
@ -68,10 +67,7 @@ class TestCopyResultExclude(unittest.TestCase):
task.args = {'_raw_params': 'Args1'}
self.play_context.check_mode = True
try:
self.mock_am = ActionModule(task, self.connection, self.play_context, loader=None, templar=None, shared_loader_obj=None)
except AnsibleActionFail:
pass
self.mock_am = ActionModule(task, self.connection, self.play_context, loader=None, templar=None, shared_loader_obj=None)
def test_raw_test_environment_is_None(self):

75
test/units/plugins/connection/test_connection.py
Unescape Escape View File

@ -27,6 +27,28 @@ from ansible.plugins.connection import ConnectionBase
from ansible.plugins.loader import become_loader
class NoOpConnection(ConnectionBase):
@property
def transport(self):
"""This method is never called by unit tests."""
def _connect(self):
"""This method is never called by unit tests."""
def exec_command(self):
"""This method is never called by unit tests."""
def put_file(self):
"""This method is never called by unit tests."""
def fetch_file(self):
"""This method is never called by unit tests."""
def close(self):
"""This method is never called by unit tests."""
class TestConnectionBaseClass(unittest.TestCase):
def setUp(self):
@ -45,36 +67,8 @@ class TestConnectionBaseClass(unittest.TestCase):
with self.assertRaises(TypeError):
ConnectionModule1() # pylint: disable=abstract-class-instantiated
class ConnectionModule2(ConnectionBase):
def get(self, key):
super(ConnectionModule2, self).get(key)
with self.assertRaises(TypeError):
ConnectionModule2() # pylint: disable=abstract-class-instantiated
def test_subclass_success(self):
class ConnectionModule3(ConnectionBase):
@property
def transport(self):
pass
def _connect(self):
pass
def exec_command(self):
pass
def put_file(self):
pass
def fetch_file(self):
pass
def close(self):
pass
self.assertIsInstance(ConnectionModule3(self.play_context, self.in_stream), ConnectionModule3)
self.assertIsInstance(NoOpConnection(self.play_context, self.in_stream), NoOpConnection)
def test_check_password_prompt(self):
local = (
@ -129,28 +123,7 @@ debug3: receive packet: type 98
debug1: Sending command: /bin/sh -c 'sudo -H -S -p "[sudo via ansible, key=ouzmdnewuhucvuaabtjmweasarviygqq] password: " -u root /bin/sh -c '"'"'echo
'''
class ConnectionFoo(ConnectionBase):
@property
def transport(self):
pass
def _connect(self):
pass
def exec_command(self):
pass
def put_file(self):
pass
def fetch_file(self):
pass
def close(self):
pass
c = ConnectionFoo(self.play_context, self.in_stream)
c = NoOpConnection(self.play_context, self.in_stream)
c.set_become_plugin(become_loader.get('sudo'))
c.become.prompt = '[sudo via ansible, key=ouzmdnewuhucvuaabtjmweasarviygqq] password: '

15
test/units/plugins/connection/test_ssh.py
Unescape Escape View File

@ -141,9 +141,8 @@ class TestConnectionBaseClass(unittest.TestCase):
conn.become.check_missing_password = MagicMock(side_effect=_check_missing_password)
def get_option(option):
if option == 'become_pass':
return 'password'
return None
assert option == 'become_pass'
return 'password'
conn.become.get_option = get_option
output, unprocessed = conn._examine_output(u'source', u'state', b'line 1\nline 2\nfoo\nline 3\nthis should be the remainder', False)
@ -350,7 +349,7 @@ class MockSelector(object):
self.register = MagicMock(side_effect=self._register)
self.unregister = MagicMock(side_effect=self._unregister)
self.close = MagicMock()
self.get_map = MagicMock(side_effect=self._get_map)
self.get_map = MagicMock()
self.select = MagicMock()
def _register(self, *args, **kwargs):
@ -359,9 +358,6 @@ class MockSelector(object):
def _unregister(self, *args, **kwargs):
self.files_watched -= 1
def _get_map(self, *args, **kwargs):
return self.files_watched
@pytest.fixture
def mock_run_env(request, mocker):
@ -456,7 +452,8 @@ class TestSSHConnectionRun(object):
def _password_with_prompt_examine_output(self, sourice, state, b_chunk, sudoable):
if state == 'awaiting_prompt':
self.conn._flags['become_prompt'] = True
elif state == 'awaiting_escalation':
else:
assert state == 'awaiting_escalation'
self.conn._flags['become_success'] = True
return (b'', b'')
@ -545,7 +542,6 @@ class TestSSHConnectionRetries(object):
def test_incorrect_password(self, monkeypatch):
self.conn.set_option('host_key_checking', False)
self.conn.set_option('reconnection_retries', 5)
monkeypatch.setattr('time.sleep', lambda x: None)
self.mock_popen_res.stdout.read.side_effect = [b'']
self.mock_popen_res.stderr.read.side_effect = [b'Permission denied, please try again.\r\n']
@ -668,7 +664,6 @@ class TestSSHConnectionRetries(object):
self.conn.set_option('reconnection_retries', 3)
monkeypatch.setattr('time.sleep', lambda x: None)
monkeypatch.setattr('ansible.plugins.connection.ssh.os.path.exists', lambda x: True)
self.mock_popen_res.stdout.read.side_effect = [b"", b"my_stdout\n", b"second_line"]
self.mock_popen_res.stderr.read.side_effect = [b"", b"my_stderr"]

Write Preview
Loading…
Cancel
Save