BUG19660283: Fix failing unit tests with MySQL server 5.7.5

peeyushgupta · peeyushgupta · commit 062cbdeffcd7 · 2014-10-01T11:56:35.000+05:30
MySQL server 5.7.5 creates no user while bootstrapping a server. We add
extra DML to create the root@ocalhost user, making sure unit test can
run.
diff --git a/tests/mysqld.py b/tests/mysqld.py
@@ -419,6 +419,16 @@ def bootstrap(self):
             "CREATE DATABASE myconnpy;"
         ]
 
+        if self._version[0:3] >= (5, 7, 5):
+            # MySQL 5.7.5 creates no user while bootstrapping
+            extra_sql.append(
+                "INSERT INTO mysql.user VALUES ('localhost','root','',"
+                "'Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y',"
+                "'Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y',"
+                "'Y','Y','Y','Y','Y','','','','',0,0,0,0,"
+                "@@default_authentication_plugin,'','N',"
+                "CURRENT_TIMESTAMP,NULL);"
+            )
         if self._version[0:3] >= (5, 7, 4):
             # MySQL 5.7.4 only creates root@localhost
             extra_sql.append(
diff --git a/tests/test_bugs.py b/tests/test_bugs.py
@@ -2305,6 +2305,9 @@ def test_parameters(self):
                       err)
 
 
+@unittest.skipIf(tests.MYSQL_VERSION >= (5, 7, 5),
+                 "MySQL {0} does not support old password auth".format(
+                     tests.MYSQL_VERSION_TXT))
 class BugOra18415927(tests.MySQLConnectorTests):
     """BUG#18415927: AUTH_RESPONSE VARIABLE INCREMENTED WITHOUT BEING DEFINED
     """
diff --git a/tests/test_mysql_datatypes.py b/tests/test_mysql_datatypes.py
@@ -28,7 +28,7 @@
 import time
 import datetime
 
-from mysql.connector import connection
+from mysql.connector import connection, errors
 import tests
 
 
@@ -339,18 +339,23 @@ def test_temporal_datetime(self):
 
         # Testing YEAR(2), which is now obsolete since MySQL 5.6.6
         tblname = self.tables['temporal_year']
-        cur.execute(
+        stmt = (
             "CREATE TABLE {table} ("
             "`id` int NOT NULL AUTO_INCREMENT KEY, "
             "`t_year_2` YEAR(2))".format(table=tblname)
-            )
-        cur.execute(_get_insert_stmt(tblname, ['t_year_2']), (10,))
-        cur.execute(_get_select_stmt(tblname, ['t_year_2']))
-        row = cur.fetchone()
-
-        if tests.MYSQL_VERSION >= (5, 6, 6):
-            self.assertEqual(2010, row[0])
+        )
+        if tests.MYSQL_VERSION >= (5, 7, 5):
+            # Support for YEAR(2) removed in MySQL 5.7.5
+            self.assertRaises(errors.DatabaseError, cur.execute, stmt)
         else:
-            self.assertEqual(10, row[0])
+            cur.execute(stmt)
+            cur.execute(_get_insert_stmt(tblname, ['t_year_2']), (10,))
+            cur.execute(_get_select_stmt(tblname, ['t_year_2']))
+            row = cur.fetchone()
+
+            if tests.MYSQL_VERSION >= (5, 6, 6):
+                self.assertEqual(2010, row[0])
+            else:
+                self.assertEqual(10, row[0])
 
         cur.close()
