BUG27794178: Using use_pure=False should raise an error if cext is not available

nmariz · nmariz · commit c2e6c5d700c0 · 2018-11-28T17:25:21.000Z
The pure Python implementation is used instead of raising an error when the
connection option `pure_python` is set to False and the C extension is not
available.

Tests were added/changed.
diff --git a/lib/mysql/connector/__init__.py b/lib/mysql/connector/__init__.py
@@ -160,13 +160,13 @@ def connect(*args, **kwargs):
         # No pooling
         pass
 
-    use_pure = kwargs.setdefault('use_pure', False)
-
-    try:
-        del kwargs['use_pure']
-    except KeyError:
-        # Just making sure 'use_pure' is not kwargs
-        pass
+    # Use C Extension by default
+    use_pure = kwargs.get('use_pure', False)
+    if 'use_pure' in kwargs:
+        del kwargs['use_pure']  # Remove 'use_pure' from kwargs
+        if not use_pure and not HAVE_CEXT:
+            raise ImportError("MySQL Connector/Python C Extension not "
+                              "available")
 
     if HAVE_CEXT and not use_pure:
         return CMySQLConnection(*args, **kwargs)
diff --git a/tests/issues/test_bug21879914.py b/tests/issues/test_bug21879914.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0, as
@@ -52,6 +52,8 @@
 
 OPTION_FILE = os.path.join('tests', 'data', 'option_files', 'my.cnf')
 
+
+@unittest.skipIf(not CMySQLConnection, "C Extension not available")
 class Bug21879914(tests.MySQLConnectorTests):
 
     def test_ssl_cipher_in_option_file(self):
diff --git a/tests/test_bugs.py b/tests/test_bugs.py
@@ -4345,6 +4345,7 @@ def test_pure_verify_server_certifcate(self):
 
         self._verify_cert(config)
 
+    @unittest.skipIf(not CMySQLConnection, ERR_NO_CEXT)
     def test_cext_verify_server_certifcate(self):
         config = self.config.copy()
         config['use_pure'] = False
@@ -4495,6 +4496,7 @@ def test_ssl_disabled_pure(self):
         self.config['use_pure'] = True
         self._test_ssl_modes()
 
+    @unittest.skipIf(not CMySQLConnection, ERR_NO_CEXT)
     def test_ssl_disabled_cext(self):
         self.config['use_pure'] = False
         self._test_ssl_modes()
@@ -4940,7 +4942,7 @@ def try_connect(self, tls_version, expected_ssl_version):
         cur = cnx.cursor()
         cur.execute(query)
         res = cur.fetchall()
-        
+
         if isinstance(expected_ssl_version, tuple):
             msg = ("Not using the expected or greater TLS version: {}, instead"
                    " the connection used: {}.")
@@ -5553,8 +5555,26 @@ def _verify_server_name_cnx(self, use_pure=True):
         cnx = mysql.connector.connect(**config)
         cnx.close()
 
+    @unittest.skipIf(not CMySQLConnection, ERR_NO_CEXT)
     def test_verify_server_name_cext_cnx(self):
         self._verify_server_name_cnx(use_pure=False)
 
     def test_verify_server_name_pure_cnx(self):
         self._verify_server_name_cnx(use_pure=True)
+
+
+@unittest.skipIf(CMySQLConnection, "Test only available without C Extension")
+class BugOra27794178(tests.MySQLConnectorTests):
+    """BUG#27794178: USING USE_PURE=FALSE SHOULD RAISE AN ERROR WHEN CEXT IS NOT
+    AVAILABLE
+    """
+    def test_connection_use_pure(self):
+        config = tests.get_mysql_config().copy()
+        if "use_pure" in config:
+            del config["use_pure"]
+        cnx = mysql.connector.connect(**config)
+        cnx.close()
+
+        # Force using C Extension should fail if not available
+        config["use_pure"] = False
+        self.assertRaises(ImportError, mysql.connector.connect, **config)
diff --git a/tests/test_examples.py b/tests/test_examples.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0, as
@@ -33,11 +33,18 @@
 
 from hashlib import md5
 import sys
-
+import unittest
 import tests
+
 from . import PY2
 import mysql.connector
 
+try:
+    from mysql.connector.connection_cext import CMySQLConnection
+except ImportError:
+    # Test without C Extension
+    CMySQLConnection = None
+
 
 class TestExamples(tests.MySQLConnectorTests):
 
@@ -217,6 +224,7 @@ def test_prepared_statements(self):
         sys.modules.pop('examples.prepared_statements', None)
 
 
+@unittest.skipIf(not CMySQLConnection, "C Extension not available")
 class TestExamplesCExt(TestExamples):
 
     def setUp(self):
