From e4eb268a5678ae620b05401c3ae3339f74303054 Mon Sep 17 00:00:00 2001
From: Guillaume Abrioux <gabrioux@ibm.com>
Date: Mon, 12 Feb 2024 21:04:12 +0100
Subject: [PATCH] tests: add flake8 to tox.ini

this:
- adds flake8 to tox.ini
- addresses all flake8 errors

Signed-off-by: Guillaume Abrioux <gabrioux@ibm.com>
---
 library/ceph_authtool.py                | 24 +++++++++---------------
 library/ceph_config.py                  |  3 +--
 tests/functional/tests/mon/test_mons.py |  2 --
 tests/library/test_ceph_crush_rule.py   | 12 ------------
 tox.ini                                 | 19 +++++++++++++++++++
 5 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/library/ceph_authtool.py b/library/ceph_authtool.py
index b9ff4ba0e..e469bcb1e 100644
--- a/library/ceph_authtool.py
+++ b/library/ceph_authtool.py
@@ -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()
diff --git a/library/ceph_config.py b/library/ceph_config.py
index ece1b0d09..1bd1d7387 100644
--- a/library/ceph_config.py
+++ b/library/ceph_config.py
@@ -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
diff --git a/tests/functional/tests/mon/test_mons.py b/tests/functional/tests/mon/test_mons.py
index fd09c0d69..d50f7981f 100644
--- a/tests/functional/tests/mon/test_mons.py
+++ b/tests/functional/tests/mon/test_mons.py
@@ -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")
-
diff --git a/tests/library/test_ceph_crush_rule.py b/tests/library/test_ceph_crush_rule.py
index c8e51be2c..ecaaf25bd 100644
--- a/tests/library/test_ceph_crush_rule.py
+++ b/tests/library/test_ceph_crush_rule.py
@@ -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({
diff --git a/tox.ini b/tox.ini
index 9934963f2..ab89d8ba1 100644
--- a/tox.ini
+++ b/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}