Fix failing unittests

Author: isrgomez

lib/mysql/connector/abstracts.py

@@ -281,7 +281,7 @@ def config(self, **kwargs):
             ('username', 'user'),
             ('passwd', 'password'),
             ('connect_timeout', 'connection_timeout'),
-            ('read_default_file', 'option_files') ,
+            ('read_default_file', 'option_files'),
         ]
         for compat, translate in compat_map:
             try:

lib/mysqlx/compat.py

@@ -82,5 +82,5 @@ def hexlify(data):
     UNICODE_TYPES = (unicode,)
     STRING_TYPES = (str, unicode,)
     BYTE_TYPES = (bytearray,)
-    MAX_INT = sys.maxint
+    MAX_INT = sys.maxint  # pylint: disable=E1101
     JSONDecodeError = ValueError

lib/mysqlx/connection.py

@@ -203,8 +203,11 @@ def set_ssl(self, ssl_mode, ssl_ca, ssl_crl, ssl_cert, ssl_key):
             self.close()
             raise RuntimeError("Python installation has no SSL support")
 
-        protocol = ssl.PROTOCOL_TLS if hasattr(ssl, "PROTOCOL_TLS") \
-                                    else ssl.PROTOCOL_TLSv1
+        if hasattr(ssl, "PROTOCOL_TLS"):
+            protocol = ssl.PROTOCOL_TLS  # pylint: disable=E1101
+        else:
+            protocol = ssl.PROTOCOL_TLSv1
+
         context = ssl.SSLContext(protocol)
         context.load_default_certs()
 

src/mysql_capi.c

@@ -890,22 +890,49 @@ MySQL_autocommit(MySQL *self, PyObject *mode)
 PyObject*
 MySQL_change_user(MySQL *self, PyObject *args, PyObject *kwds)
 {
-	char *user= NULL, *password= NULL, *database= NULL;
+	char *user= NULL, *database= NULL;
+#ifdef PY3
+    char *password = NULL;
+#else
+    PyObject *password = NULL;
+#endif
 	int res;
 	static char *kwlist[]= {"user", "password", "database", NULL};
 
     IS_CONNECTED(self);
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwds, "|sss", kwlist,
-                                     &user, &password, &database))
+#ifdef PY3
+    if (!PyArg_ParseTupleAndKeywords(args, kwds, "|zzz", kwlist,
+#else
+    if (!PyArg_ParseTupleAndKeywords(args, kwds, "|zOz", kwlist,
+#endif
+                                     &user, &password, &database
+                                     ))
     {
         return NULL;
     }
-
+#ifdef PY3
     Py_BEGIN_ALLOW_THREADS
     res= mysql_change_user(&self->session, user, password, database);
     Py_END_ALLOW_THREADS
-
+#else
+{
+	char* c_password;
+	if (PyUnicode_Check(password))
+	{
+		PyObject* u_password= PyUnicode_AsUTF8String(password);
+		c_password= PyString_AsString(u_password);
+		Py_DECREF(u_password);
+	}
+	else
+	{
+		c_password= PyString_AsString(password);
+	}
+	Py_BEGIN_ALLOW_THREADS
+	res= mysql_change_user(&self->session, user, c_password, database);
+	Py_END_ALLOW_THREADS
+}
+#endif
     if (res)
     {
     	raise_with_session(&self->session, NULL);

tests/test_abstracts.py

@@ -172,6 +172,8 @@ def test_cmd_init_db(self):
     @unittest.skipIf(tests.MYSQL_VERSION < (5, 7, 2),
                      "reset command not available")
     @foreach_cnx()
+    @unittest.skipIf(tests.MYSQL_VERSION < (8, 0),
+                     "Not working with cross version MySQL lib< 8.0.")
     def test_reset_session(self):
         exp = [True, u'STRICT_ALL_TABLES', u'-09:00', 33]
         self.cnx.autocommit = exp[0]

tests/test_bugs.py

@@ -771,6 +771,7 @@ def test_reconnect(self):
             self.assertTrue('3 attempt(s)' in str(exc))
 
 
+@unittest.skipIf(sys.version_info < (3, 5), "Objects not collected by GC.")
 class BugOra13435186(tests.MySQLConnectorTests):
     def setUp(self):
         self.sample_size = 100
@@ -2341,8 +2342,9 @@ def test_ssl(self):
         self.assertTrue(res != '')
 
 
-@unittest.skipIf(tests.MYSQL_VERSION < (5, 6, 7),
-                 "BugOra16217765 not tested with MySQL version < 5.6.7")
+@unittest.skipIf(tests.MYSQL_VERSION < (8, 0),
+                 "BugOra16217765 not tested with MySQL version < 5.6.7. "
+                 "Not working with cross version MySQL lib< 8.0.")
 class BugOra16217765(tests.MySQLConnectorTests):
     """BUG#16217765: Fix authentication plugin support
     """