mirror of https://github.com/ceph/ceph-ansible.git
tests: add flake8 to tox.ini
this: - adds flake8 to tox.ini - addresses all flake8 errors Signed-off-by: Guillaume Abrioux <gabrioux@ibm.com>pull/7474/head
parent
1a97696d9b
commit
e4eb268a56
|
@ -4,23 +4,18 @@ __metaclass__ = type
|
|||
from ansible.module_utils.basic import AnsibleModule
|
||||
try:
|
||||
from ansible.module_utils.ca_common import container_exec, \
|
||||
is_containerized, \
|
||||
fatal
|
||||
is_containerized
|
||||
except ImportError:
|
||||
from module_utils.ca_common import container_exec, \
|
||||
is_containerized, \
|
||||
fatal
|
||||
is_containerized
|
||||
import datetime
|
||||
import json
|
||||
import os
|
||||
import struct
|
||||
import time
|
||||
import base64
|
||||
import socket
|
||||
|
||||
|
||||
class KeyringExists(Exception):
|
||||
pass
|
||||
|
||||
|
||||
def build_cmd(create_keyring=False,
|
||||
gen_key=False,
|
||||
add_key=False,
|
||||
|
@ -39,7 +34,6 @@ def build_cmd(create_keyring=False,
|
|||
else:
|
||||
c = [auth_tool_binary]
|
||||
|
||||
|
||||
if name:
|
||||
c.extend(['-n', name])
|
||||
if create_keyring:
|
||||
|
@ -59,6 +53,7 @@ def build_cmd(create_keyring=False,
|
|||
|
||||
return c
|
||||
|
||||
|
||||
def run_module():
|
||||
module_args = dict(
|
||||
name=dict(type='str', required=False),
|
||||
|
@ -76,9 +71,6 @@ def run_module():
|
|||
add_file_common_args=True,
|
||||
)
|
||||
|
||||
|
||||
|
||||
|
||||
cmd = []
|
||||
changed = False
|
||||
|
||||
|
@ -126,12 +118,14 @@ def run_module():
|
|||
if rc != 0:
|
||||
module.fail_json(msg='non-zero return code', **result)
|
||||
|
||||
#file_args = module.load_file_common_arguments(module.params)
|
||||
#module.set_fs_attributes_if_different(file_args, False)
|
||||
# file_args = module.load_file_common_arguments(module.params)
|
||||
# module.set_fs_attributes_if_different(file_args, False)
|
||||
module.exit_json(**result)
|
||||
|
||||
|
||||
def main():
|
||||
run_module()
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
# Author: Guillaume Abrioux <gabrioux@redhat.com>
|
||||
|
||||
from __future__ import absolute_import, division, print_function
|
||||
from typing import List, Tuple
|
||||
__metaclass__ = type
|
||||
|
||||
from ansible.module_utils.basic import AnsibleModule # type: ignore
|
||||
|
@ -167,7 +166,7 @@ def main() -> None:
|
|||
|
||||
if action == 'set':
|
||||
if value.lower() == current_value:
|
||||
out = 'who={} option={} value={} already set. Skipping.'.format(who, option, value, container_image=container_image)
|
||||
out = 'who={} option={} value={} already set. Skipping.'.format(who, option, value)
|
||||
else:
|
||||
rc, cmd, out, err = set_option(module, who, option, value, container_image=container_image)
|
||||
changed = True
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
import pytest
|
||||
import re
|
||||
|
||||
|
||||
class TestMons(object):
|
||||
|
@ -28,4 +27,3 @@ class TestMons(object):
|
|||
cmd = "sudo ceph --cluster={} --connect-timeout 5 -s".format(setup["cluster_name"]) # noqa E501
|
||||
output = host.check_output(cmd)
|
||||
assert output.strip().startswith("cluster")
|
||||
|
||||
|
|
|
@ -17,18 +17,6 @@ fake_keyring = '/etc/ceph/{}.{}.keyring'.format(fake_cluster, fake_user)
|
|||
|
||||
|
||||
class TestCephCrushRuleModule(object):
|
||||
|
||||
@patch('ansible.module_utils.basic.AnsibleModule.fail_json')
|
||||
def test_without_parameters(self, m_fail_json):
|
||||
ca_test_common.set_module_args({})
|
||||
m_fail_json.side_effect = ca_test_common.fail_json
|
||||
|
||||
with pytest.raises(ca_test_common.AnsibleFailJson) as result:
|
||||
ceph_crush_rule.main()
|
||||
|
||||
result = result.value.args[0]
|
||||
assert result['msg'] == 'missing required arguments: name'
|
||||
|
||||
@patch('ansible.module_utils.basic.AnsibleModule.fail_json')
|
||||
def test_with_name_only(self, m_fail_json):
|
||||
ca_test_common.set_module_args({
|
||||
|
|
19
tox.ini
19
tox.ini
|
@ -3,6 +3,7 @@ envlist = centos-{container,non_container}-{all_daemons,all_daemons_ipv6,colloca
|
|||
centos-non_container-{switch_to_containers}
|
||||
infra_lv_create
|
||||
migrate_ceph_disk_to_ceph_volume
|
||||
flake8
|
||||
|
||||
skipsdist = True
|
||||
|
||||
|
@ -419,3 +420,21 @@ commands=
|
|||
cephadm_adopt: {[cephadm-adopt]commands}
|
||||
|
||||
vagrant destroy --force
|
||||
|
||||
[testenv:flake8]
|
||||
max-line-length = 100
|
||||
ignore =
|
||||
E501,
|
||||
W503,
|
||||
exclude =
|
||||
.tox \
|
||||
.vagrant \
|
||||
__pycache__ \
|
||||
*.pyc \
|
||||
templates \
|
||||
.eggs
|
||||
statistics = True
|
||||
deps =
|
||||
flake8
|
||||
commands =
|
||||
flake8 --max-line-length=160 ./library ./module_utils/ ./tests/library/ ./tests/module_utils/ ./tests/functional/tests/ {posargs}
|
||||
|
|
Loading…
Reference in New Issue