From 8ff33bd729c4fd0a4895e788f380889626601ec4 Mon Sep 17 00:00:00 2001 From: Andrew Klychkov Date: Thu, 10 Dec 2020 13:58:38 +0300 Subject: [PATCH] Improve code and coverage --- plugins/modules/mysql_replication.py | 7 ++----- tests/unit/plugins/modules/test_mysql_replication.py | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/plugins/modules/mysql_replication.py b/plugins/modules/mysql_replication.py index 566f08b..fd5a9ef 100644 --- a/plugins/modules/mysql_replication.py +++ b/plugins/modules/mysql_replication.py @@ -248,14 +248,11 @@ executed_queries = [] def uses_replica_terminology(cursor): """Checks if REPLICA must be used instead of SLAVE""" - cursor.execute("SELECT VERSION()") + cursor.execute("SELECT VERSION() AS version") result = cursor.fetchone() if isinstance(result, dict): - if 'VERSION()' in result: - version_str = result['VERSION()'] - else: - version_str = result['version()'] + version_str = result['version'] else: version_str = result[0] diff --git a/tests/unit/plugins/modules/test_mysql_replication.py b/tests/unit/plugins/modules/test_mysql_replication.py index 5969597..678906e 100644 --- a/tests/unit/plugins/modules/test_mysql_replication.py +++ b/tests/unit/plugins/modules/test_mysql_replication.py @@ -19,7 +19,7 @@ class dummy_cursor_class(): def fetchone(self): if self.ret_val_type == 'dict': - return {'VERSION()': self.output} + return {'version': self.output} elif self.ret_val_type == 'list': return [self.output]