BUG23722871: Fix running unittests with mysqlx plugin

Unittests hang when running the entire test suite with MySQLx tests.

Each of the mysqlx tests in mysqlx_crud attempts to drop the main schema
`myconnpy` as a part of test tearDown method. This causes a database
lock since there are other sessions open with `myconnpy` as the default
database.

Previous sessions need to be closed before attempting to drop the schema.
But the Session.close API is included in release 2.2.1. As of now, we do
nothing in the tear down method.

Author: amitab

examples/dates.py

@@ -82,6 +82,7 @@ def main(config):
         except (mysql.connector.errors.Error, TypeError) as exc:
             output.append("Failed inserting {0}\nError: {1}\n".format(
                 data, exc))
+            cursor.execute(stmt_drop)
             raise
 
     # Read the names again and print them

examples/microseconds.py

@@ -95,7 +95,8 @@ def main(config):
     except:
         # Ignoring the fact that it was not there
         pass
-    
+
+    cursor.execute("DROP TABLE IF EXISTS relay_laps")
     cursor.close()
     cnx.close()
 

tests/cext/test_cext_api.py

@@ -426,6 +426,7 @@ def test_autocommit(self):
         cmy2.query("SELECT * FROM {0} WHERE c1 > 3".format(table))
         self.assertEqual([(4,), (5,), (6,)], fetch_rows(cmy2))
 
+        cmy1.query("DROP TABLE IF EXISTS {0}".format(table))
         cmy1.close()
         cmy2.close()
 
@@ -768,3 +769,4 @@ def test_next_result(self):
             have_more = cmy.next_result()
 
         self.assertEqual(exp, result)
+        cmy.query("DROP TABLE IF EXISTS {0}".format(table))

tests/test_bugs.py

@@ -109,6 +109,8 @@ def test_execute_return(self):
         self.assertEqual(6, cur.rowcount)
         res = cur.execute("UPDATE %s SET id = id + %%s" % tbl, (10,))
         self.assertEqual(8, cur.rowcount)
+
+        cur.execute("DROP TABLE IF EXISTS {0}".format(tbl))
         cur.close()
         self.cnx.close()
 
@@ -657,6 +659,13 @@ class BugOra13395083(tests.MySQLConnectorTests):
     def setUp(self):
         self.table_name = 'BugOra13395083'
 
+    def tearDown(self):
+        config = tests.get_mysql_config()
+        cnx = connection.MySQLConnection(**config)
+        cur = cnx.cursor()
+
+        cur.execute("DROP TABLE IF EXISTS {0}".format(self.table_name))
+
     @cnx_config(time_zone="+00:00")
     @foreach_cnx()
     def test_time_zone(self):
@@ -856,6 +865,12 @@ def _setup(self):
         self.cnx.cmd_query("DROP TABLE IF EXISTS %s" % self.table)
         self.cnx.cmd_query("CREATE TABLE %s (id INT)" % self.table)
 
+    def tearDown(self):
+        config = tests.get_mysql_config()
+        self.cnx = connection.MySQLConnection(**config)
+
+        self.cnx.cmd_query("DROP TABLE IF EXISTS {0}".format(self.table))
+
     @foreach_cnx(connection.MySQLConnection)
     def test_cmd_query(self):
         self._setup()
@@ -943,6 +958,12 @@ def _setup(self):
                   "PRIMARY KEY (`id`,`c1`))" % (self.tbl))
         cur.execute(create)
 
+    def tearDown(self):
+        config = tests.get_mysql_config()
+        cnx = connection.MySQLConnection(**config)
+        cur = cnx.cursor()
+        cur.execute("DROP TABLE IF EXISTS {0}".format(self.tbl))
+
     @foreach_cnx()
     def test_executemany(self):
         self._setup()
@@ -2110,6 +2131,10 @@ def setUp(self):
                   "PRIMARY KEY (`id`))" % (self.city_tbl))
         self.cursor.execute(create)
 
+    def tearDown(self):
+        self.cursor.execute("DROP TABLE IF EXISTS {0}".format(self.city_tbl))
+        self.cursor.execute("DROP TABLE IF EXISTS {0}".format(self.emp_tbl))
+
     def test_executemany(self):
         stmt = "INSERT INTO {0} (id,name) VALUES (%s,%s)".format(
             self.city_tbl)
@@ -2448,6 +2473,15 @@ def _setup(self):
         cur.execute(create)
         cnx.close()
 
+    def tearDown(self):
+        config = tests.get_mysql_config()
+        config['use_unicode'] = True
+        cnx = connection.MySQLConnection(**config)
+        cur = cnx.cursor()
+
+        cur.execute("DROP TABLE IF EXISTS {0}".format(self.table))
+        cur.execute("DROP TABLE IF EXISTS {0}".format(self.table_cp1251))
+
     @cnx_config(use_unicode=True)
     @foreach_cnx(connection.MySQLConnection)
     def test_prepared_statement(self):
@@ -2653,7 +2687,6 @@ def setUp(self):
         self.cnx.cmd_query(create)
 
     def tearDown(self):
-        return
         if self.cnx:
             self.cnx.cmd_query("DROP TABLE IF EXISTS {0}".format(self.tbl))
 

tests/test_cursor.py

@@ -1332,6 +1332,7 @@ def setUp(self):
                          'name VARCHAR(20), city VARCHAR(20))')
 
     def tearDown(self):
+        self.cur.execute('DROP TABLE IF EXISTS MySQLCursorBufferedDictTests')
         self.cur.close()
         self.connection.close()
 
@@ -1406,6 +1407,9 @@ def setUp(self):
                          'id INT(10), name VARCHAR(20), city VARCHAR(20))')
 
     def tearDown(self):
+        self.cur.execute('DROP TABLE IF EXISTS '
+                         'MySQLCursorBufferedNamedTupleTests')
+
         self.cur.close()
         self.connection.close()
 

tests/test_mysql_datatypes.py

@@ -84,16 +84,14 @@ def drop_tables(self, cnx):
 class TestsCursor(TestsDataTypes):
 
     def setUp(self):
-        pass
-        #self.config = tests.get_mysql_config()
-        #cnx = connection.MySQLConnection(**self.config)
-        #self.drop_tables(cnx)
+        self.config = tests.get_mysql_config()
+        cnx = connection.MySQLConnection(**self.config)
+        self.drop_tables(cnx)
 
     def tearDown(self):
-        pass
-        #cnx = connection.MySQLConnection(**self.config)
-        #self.drop_tables(cnx)
-        #cnx.close()
+        cnx = connection.MySQLConnection(**self.config)
+        self.drop_tables(cnx)
+        cnx.close()
 
     @foreach_cnx()
     def test_numeric_int(self):

tests/test_mysqlx_connection.py

@@ -124,8 +124,10 @@ def test_get_default_schema(self):
         session.close()
 
     def test_drop_schema(self):
-        self.session.drop_schema(self.schema_name)
-        schema = self.session.get_schema(self.schema_name)
+        test_schema = 'mysql_xsession_test_drop_schema'
+        schema = self.session.create_schema(test_schema)
+
+        self.session.drop_schema(test_schema)
         self.assertFalse(schema.exists_in_database())
 
     def test_create_schema(self):
@@ -196,8 +198,10 @@ def test_get_default_schema(self):
         session.close()
 
     def test_drop_schema(self):
-        self.session.drop_schema(self.schema_name)
-        schema = self.session.get_schema(self.schema_name)
+        test_schema = 'mysql_nodesession_test_drop_schema'
+        schema = self.session.create_schema(test_schema)
+
+        self.session.drop_schema(test_schema)
         self.assertFalse(schema.exists_in_database())
 
     def test_create_schema(self):