From 6ac515bfa557dfa5b64d8e11f31b8927867e66a6 Mon Sep 17 00:00:00 2001 From: William Welter Date: Fri, 19 Jan 2024 11:11:05 +0000 Subject: [PATCH] Removing is_mariadb and is_mysql functions --- plugins/module_utils/mysql.py | 14 -------------- plugins/modules/mysql_info.py | 3 +-- tests/unit/plugins/module_utils/test_mysql.py | 18 +----------------- 3 files changed, 2 insertions(+), 33 deletions(-) diff --git a/plugins/module_utils/mysql.py b/plugins/module_utils/mysql.py index ffd234a..10ccfcf 100644 --- a/plugins/module_utils/mysql.py +++ b/plugins/module_utils/mysql.py @@ -214,20 +214,6 @@ def get_server_implementation(cursor): return "mysql" -def is_mariadb(implementation): - if implementation == "mariadb": - return True - else: - return False - - -def is_mysql(implementation): - if implementation == "mysql": - return True - else: - return False - - def set_session_vars(module, cursor, session_vars): """Set session vars.""" for var, value in session_vars.items(): diff --git a/plugins/modules/mysql_info.py b/plugins/modules/mysql_info.py index 26b9cec..303921b 100644 --- a/plugins/modules/mysql_info.py +++ b/plugins/modules/mysql_info.py @@ -294,7 +294,6 @@ from ansible_collections.community.mysql.plugins.module_utils.mysql import ( get_connector_name, get_connector_version, get_server_implementation, - is_mariadb, ) from ansible_collections.community.mysql.plugins.module_utils.user import ( @@ -501,7 +500,7 @@ class MySQL_Info(object): def __get_slave_status(self): """Get slave status if the instance is a slave.""" - if is_mariadb(self.server_implementation): + if self.server_implementation == "mariadb": res = self.__exec_sql('SHOW ALL SLAVES STATUS') else: res = self.__exec_sql('SHOW SLAVE STATUS') diff --git a/tests/unit/plugins/module_utils/test_mysql.py b/tests/unit/plugins/module_utils/test_mysql.py index 4d57100..5410575 100644 --- a/tests/unit/plugins/module_utils/test_mysql.py +++ b/tests/unit/plugins/module_utils/test_mysql.py @@ -4,7 +4,7 @@ __metaclass__ = type import pytest -from ansible_collections.community.mysql.plugins.module_utils.mysql import get_server_version, get_server_implementation, is_mariadb, is_mysql +from ansible_collections.community.mysql.plugins.module_utils.mysql import get_server_version, get_server_implementation from ..utils import dummy_cursor_class @@ -41,19 +41,3 @@ def test_get_server_implamentation(cursor_return_version, cursor_return_type, se cursor = dummy_cursor_class(cursor_return_version, cursor_return_type) assert get_server_implementation(cursor) == server_implementation - - -def test_is_mysql(): - """ - Test that server is_mysql return expect results - """ - assert is_mysql("mysql") is True - assert is_mysql("mariadb") is False - - -def test_is_mariadb(): - """ - Test that server is_mariadb return expect results - """ - assert is_mariadb("mariadb") is True - assert is_mariadb("mysql") is False