From 9b8455c2e66aebd2e0adeb544450749876d7537d Mon Sep 17 00:00:00 2001
From: Andrew Klychkov <aklychko@redhat.com>
Date: Tue, 14 Feb 2023 09:57:44 +0100
Subject: [PATCH] Fix sanity (#508)

* Fix sanity

* Remove as unnecessary
---
 plugins/modules/mysql_replication.py               | 1 -
 tests/sanity/ignore-2.10.txt                       | 8 --------
 tests/sanity/ignore-2.11.txt                       | 8 --------
 tests/sanity/ignore-2.15.txt                       | 2 ++
 tests/sanity/ignore-2.9.txt                        | 3 ---
 tests/unit/plugins/module_utils/test_mysql_user.py | 5 -----
 6 files changed, 2 insertions(+), 25 deletions(-)
 delete mode 100644 tests/sanity/ignore-2.10.txt
 delete mode 100644 tests/sanity/ignore-2.11.txt
 delete mode 100644 tests/sanity/ignore-2.9.txt

diff --git a/plugins/modules/mysql_replication.py b/plugins/modules/mysql_replication.py
index 5d1a0e5..33e14bc 100644
--- a/plugins/modules/mysql_replication.py
+++ b/plugins/modules/mysql_replication.py
@@ -292,7 +292,6 @@ from ansible_collections.community.mysql.plugins.module_utils.mysql import (
     mysql_common_argument_spec,
 )
 from ansible.module_utils._text import to_native
-from ansible_collections.community.mysql.plugins.module_utils.version import LooseVersion
 
 executed_queries = []
 
diff --git a/tests/sanity/ignore-2.10.txt b/tests/sanity/ignore-2.10.txt
deleted file mode 100644
index c0323af..0000000
--- a/tests/sanity/ignore-2.10.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-plugins/modules/mysql_db.py validate-modules:doc-elements-mismatch
-plugins/modules/mysql_db.py validate-modules:parameter-list-no-elements
-plugins/modules/mysql_db.py validate-modules:use-run-command-not-popen
-plugins/modules/mysql_info.py validate-modules:doc-elements-mismatch
-plugins/modules/mysql_info.py validate-modules:parameter-list-no-elements
-plugins/modules/mysql_query.py validate-modules:parameter-list-no-elements
-plugins/modules/mysql_user.py validate-modules:undocumented-parameter
-plugins/modules/mysql_variables.py validate-modules:doc-required-mismatch
diff --git a/tests/sanity/ignore-2.11.txt b/tests/sanity/ignore-2.11.txt
deleted file mode 100644
index c0323af..0000000
--- a/tests/sanity/ignore-2.11.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-plugins/modules/mysql_db.py validate-modules:doc-elements-mismatch
-plugins/modules/mysql_db.py validate-modules:parameter-list-no-elements
-plugins/modules/mysql_db.py validate-modules:use-run-command-not-popen
-plugins/modules/mysql_info.py validate-modules:doc-elements-mismatch
-plugins/modules/mysql_info.py validate-modules:parameter-list-no-elements
-plugins/modules/mysql_query.py validate-modules:parameter-list-no-elements
-plugins/modules/mysql_user.py validate-modules:undocumented-parameter
-plugins/modules/mysql_variables.py validate-modules:doc-required-mismatch
diff --git a/tests/sanity/ignore-2.15.txt b/tests/sanity/ignore-2.15.txt
index c0323af..da0354c 100644
--- a/tests/sanity/ignore-2.15.txt
+++ b/tests/sanity/ignore-2.15.txt
@@ -6,3 +6,5 @@ plugins/modules/mysql_info.py validate-modules:parameter-list-no-elements
 plugins/modules/mysql_query.py validate-modules:parameter-list-no-elements
 plugins/modules/mysql_user.py validate-modules:undocumented-parameter
 plugins/modules/mysql_variables.py validate-modules:doc-required-mismatch
+plugins/module_utils/mysql.py pylint:unused-import
+plugins/module_utils/version.py pylint:unused-import
diff --git a/tests/sanity/ignore-2.9.txt b/tests/sanity/ignore-2.9.txt
deleted file mode 100644
index dabd55d..0000000
--- a/tests/sanity/ignore-2.9.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-plugins/modules/mysql_db.py validate-modules:use-run-command-not-popen
-plugins/modules/mysql_user.py validate-modules:parameter-type-not-in-doc
-plugins/modules/mysql_user.py validate-modules:undocumented-parameter
diff --git a/tests/unit/plugins/module_utils/test_mysql_user.py b/tests/unit/plugins/module_utils/test_mysql_user.py
index f0a7b32..46b3b8e 100644
--- a/tests/unit/plugins/module_utils/test_mysql_user.py
+++ b/tests/unit/plugins/module_utils/test_mysql_user.py
@@ -4,10 +4,6 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 import pytest
-try:
-    from unittest.mock import MagicMock
-except ImportError:
-    from mock import MagicMock
 
 from ansible_collections.community.mysql.plugins.module_utils.user import (
     handle_grant_on_col,
@@ -15,7 +11,6 @@ from ansible_collections.community.mysql.plugins.module_utils.user import (
     normalize_col_grants,
     sort_column_order
 )
-from ..utils import dummy_cursor_class
 
 
 @pytest.mark.parametrize(