Add missing yield

Author: methane

tornado_mysql/tests/test_SSCursor.py

@@ -94,14 +94,16 @@ def test_SSCursor(self):
                              'executemany failed. cursor.rowcount != %s' % (str(len(self.data))))
 
             # Test multiple datasets
-            cursor.execute('SELECT 1; SELECT 2; SELECT 3')
+            yield cursor.execute('SELECT 1; SELECT 2; SELECT 3')
             self.assertListEqual(list(cursor), [(1, )])
-            self.assertTrue(cursor.nextset())
+            res = yield cursor.nextset()
+            self.assertTrue(res)
             self.assertListEqual(list(cursor), [(2, )])
-            self.assertTrue(cursor.nextset())
+            res = yield cursor.nextset()
+            self.assertTrue(res)
             self.assertListEqual(list(cursor), [(3, )])
-            self.assertFalse(cursor.nextset())
-
+            res = yield cursor.nextset()
+            self.assertFalse(res)
         finally:
             yield cursor.execute('DROP TABLE tz_data')
             yield cursor.close()
@@ -126,6 +128,7 @@ def _cleanup(self):
         conn = self.connections[0]
         cursor = conn.cursor()
         yield cursor.execute('DROP TABLE IF EXISTS tz_data;')
+        yield cursor.close()
 
     @gen_test
     def test_sscursor_executemany(self):
@@ -135,6 +138,7 @@ def test_sscursor_executemany(self):
         # Test executemany
         yield cursor.executemany(
             'INSERT INTO tz_data VALUES (%s, %s, %s)', self.data)
+        yield cursor._close()
         msg = 'executemany failed. cursor.rowcount != %s'
         self.assertEqual(cursor.rowcount, len(self.data),
                          msg % (str(len(self.data))))

tornado_mysql/tests/test_basic.py

@@ -54,7 +54,7 @@ def test_datatypes(self):
             r = c.fetchall()
             self.assertEqual(((4,),(8,)), r)
         finally:
-            c.execute("drop table test_datatypes")
+            yield c.execute("drop table test_datatypes")
 
     @gen_test
     def test_dict(self):

tornado_mysql/tests/test_issues.py

@@ -1,5 +1,6 @@
 import datetime
 import unittest
+import warnings
 
 try:
     import imp
@@ -271,13 +272,15 @@ def disabled_test_issue_54(self):
 class TestGitHubIssues(base.PyMySQLTestCase):
     @gen_test
     def test_issue_66(self):
-        """ 'Connection' object has no attribute 'insert_id' """
+        """'Connection' object has no attribute 'insert_id'"""
         conn = self.connections[0]
         c = conn.cursor()
         self.assertEqual(0, conn.insert_id())
-        try:
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore")
             yield c.execute("drop table if exists issue66")
-            yield c.execute("create table issue66 (id integer primary key auto_increment, x integer)")
+        yield c.execute("create table issue66 (id integer primary key auto_increment, x integer)")
+        try:
             yield c.execute("insert into issue66 (x) values (1)")
             yield c.execute("insert into issue66 (x) values (1)")
             self.assertEqual(2, conn.insert_id())
@@ -290,8 +293,10 @@ def test_issue_79(self):
         conn = self.connections[0]
         c = conn.cursor(tornado_mysql.cursors.DictCursor)
 
-        yield c.execute("drop table if exists a")
-        yield c.execute("drop table if exists b")
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore")
+            yield c.execute("drop table if exists a")
+            yield c.execute("drop table if exists b")
         yield c.execute("""CREATE TABLE a (id int, value int)""")
         yield c.execute("""CREATE TABLE b (id int, value int)""")