]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
Revert "tests: add more coverage for test_ceph_key"
authorGuillaume Abrioux <gabrioux@redhat.com>
Tue, 4 Aug 2020 09:25:50 +0000 (11:25 +0200)
committerGuillaume Abrioux <gabrioux@redhat.com>
Tue, 4 Aug 2020 09:28:42 +0000 (11:28 +0200)
This reverts commit 1e46264bc19161cdf2d2f4529fc6b42f0077af83.

tests/library/test_ceph_key.py

index 2604cc02cae334c49e98703569b65735d86134e0..18bc486c25b791c8d1eb328136b083a79274ad45 100644 (file)
@@ -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