From 0a38d91b5be1f88dd5caabd03ad454895c6bdf18 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Tue, 4 Aug 2020 11:25:50 +0200 Subject: [PATCH] Revert "tests: add more coverage for test_ceph_key" This reverts commit 1e46264bc19161cdf2d2f4529fc6b42f0077af83. --- tests/library/test_ceph_key.py | 37 ---------------------------------- 1 file changed, 37 deletions(-) diff --git a/tests/library/test_ceph_key.py b/tests/library/test_ceph_key.py index 2604cc02c..18bc486c2 100644 --- a/tests/library/test_ceph_key.py +++ b/tests/library/test_ceph_key.py @@ -4,25 +4,7 @@ import sys sys.path.append('./library') import ceph_key import mock -import pytest -from ansible.module_utils import basic -from ansible.module_utils._text import to_bytes -# From ceph-ansible documentation -def set_module_args(args): - if '_ansible_remote_tmp' not in args: - args['_ansible_remote_tmp'] = '/tmp' - if '_ansible_keep_remote_files' not in args: - args['_ansible_keep_remote_files'] = False - - args = json.dumps({'ANSIBLE_MODULE_ARGS': args}) - basic._ANSIBLE_ARGS = to_bytes(args) - -class AnsibleExitJson(Exception): - pass - -def exit_json(*args, **kwargs): - raise AnsibleExitJson(kwargs) @mock.patch.dict(os.environ, {'CEPH_CONTAINER_BINARY': 'docker'}) class TestCephKeyModule(object): @@ -537,22 +519,3 @@ class TestCephKeyModule(object): expected_result = "/var/lib/ceph/bootstrap-osd/fake.keyring" result = ceph_key.build_key_path(fake_cluster, entity) assert result == expected_result - - @mock.patch('ansible.module_utils.basic.AnsibleModule.exit_json') - @mock.patch('ceph_key.exec_commands') - def test_state_info(self, m_exec_commands, m_exit_json): - set_module_args({"state": "info", - "cluster": "ceph", - "name": "client.admin" - }) - m_exit_json.side_effect = exit_json - m_exec_commands.return_value = (0, ['ceph', 'auth', 'get', 'client.admin', '-f', 'json'] ,'[{"entity":"client.admin","key":"AQC1tw5fF156GhAAoJCvHGX/jl/k7/N4VZm8iQ==","caps":{"mds":"allow *","mgr":"allow *","mon":"allow *","osd":"allow *"}}]', 'exported keyring for client.admin') - - with pytest.raises(AnsibleExitJson) as result: - ceph_key.run_module() - - result = result.value.args[0] - assert result['changed'] == False - assert result['stdout'] == '[{"entity":"client.admin","key":"AQC1tw5fF156GhAAoJCvHGX/jl/k7/N4VZm8iQ==","caps":{"mds":"allow *","mgr":"allow *","mon":"allow *","osd":"allow *"}}]' - assert result['stderr'] == 'exported keyring for client.admin' - assert result['rc'] == 0 \ No newline at end of file -- 2.47.3