From 4b4c06b4f77411782e5a62d68b8d04cfac7d6fcc Mon Sep 17 00:00:00 2001
From: Jorge-Rodriguez <jorge.rodriguez@futurice.com>
Date: Sat, 25 Jul 2020 18:34:10 +0300
Subject: [PATCH] Fix conditionals to accomodate for MySQL v8

---
 tests/integration/targets/test_mysql_user/tasks/main.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/integration/targets/test_mysql_user/tasks/main.yml b/tests/integration/targets/test_mysql_user/tasks/main.yml
index 2d72c7f..d452c8c 100644
--- a/tests/integration/targets/test_mysql_user/tasks/main.yml
+++ b/tests/integration/targets/test_mysql_user/tasks/main.yml
@@ -179,6 +179,7 @@
       - name: set old database separator
         set_fact:
           separator: '\n'
+      # Semantically: when mysql version <= 5.6 or MariaDB version <= 10.1
       when: db_version.version.major <= 5 and db_version.version.minor <= 6 or db_version.version.major == 10 and db_version.version.minor < 2
 
     - block:
@@ -190,7 +191,8 @@
       - name: set new database separator
         set_fact:
           separator: 'PASSWORD'
-      when: db_version.version.major >= 5 and db_version.version.major < 10 and db_version.version.minor > 6 or db_version.version.major == 10 and db_version.version.minor >= 2
+      # Semantically: when mysql version >= 5.7 or MariaDB version >= 10.2
+      when: db_version.version.major = 5 and db_version.version.minor >= 7 or db_version.version.major > 5 and db_version.version.major < 10  or db_version.version.major == 10 and db_version.version.minor >= 2
 
     - block:
       - name: assert user1 TLS requirements
@@ -241,7 +243,7 @@
     - name: retrieve TLS requiremets for users in new database version
       command: "{{ mysql_command }} -L -N -s -e \"SHOW CREATE USER '{{ user_name_1 }}'@'localhost'\""
       register: new_result
-      when: db_version.version.major >= 5 and db_version.version.major < 10 and db_version.version.minor > 6 or db_version.version.major == 10 and db_version.version.minor >= 2
+      when: db_version.version.major = 5 and db_version.version.minor >= 7 or db_version.version.major > 5 and db_version.version.major < 10  or db_version.version.major == 10 and db_version.version.minor >= 2
 
     - name: assert user1 TLS requirements was not changed
       assert:
@@ -265,7 +267,7 @@
     - name: retrieve TLS requiremets for users in new database version
       command: "{{ mysql_command }} -L -N -s -e \"SHOW CREATE USER '{{ user_name_1 }}'@'localhost'\""
       register: new_result
-      when: db_version.version.major >= 5 and db_version.version.major < 10 and db_version.version.minor > 6 or db_version.version.major == 10 and db_version.version.minor >= 2
+      when: db_version.version.major = 5 and db_version.version.minor >= 7 or db_version.version.major > 5 and db_version.version.major < 10  or db_version.version.major == 10 and db_version.version.minor >= 2
 
     - name: assert user1 TLS requirements
       assert: