[fea] tornado tests

Author: mosquito

.gitignore

@@ -7,7 +7,7 @@ __pycache__/
 
 # Distribution / packaging
 .Python
-env/
+env*/
 bin/
 build/
 develop-eggs/
@@ -26,7 +26,7 @@ var/
 pip-log.txt
 pip-delete-this-directory.txt
 
-# Unit test / coverage reports
+# Unit tests / coverage reports
 htmlcov/
 .tox/
 .coverage

test/test.py

@@ -0,0 +1,23 @@
+#!/usr/bin/env python
+# encoding: utf-8
+import os
+from tormysql import ConnectionPool
+from tornado.testing import AsyncTestCase
+
+
+class BaseTestCase(AsyncTestCase):
+    def setUp(self):
+        super(BaseTestCase, self).setUp()
+        self.pool = ConnectionPool(
+            max_connections=int(os.getenv("MYSQL_POOL", "5")),
+            idle_seconds=7200,
+            host=os.getenv("MYSQL_HOST", "127.0.0.1"),
+            user=os.getenv("MYSQL_USER", "root"),
+            passwd=os.getenv("MYSQL_PASSWD", ""),
+            db=os.getenv("MYSQL_DB", "mysql"),
+            charset=os.getenv("MYSQL_CHARSET", "utf8"),
+        )
+
+    def tearDown(self):
+        super(BaseTestCase, self).tearDown()
+        self.pool.close()

tests/__init__.py

@@ -0,0 +1,17 @@
+# encoding: utf-8
+from tornado.testing import gen_test
+from . import BaseTestCase
+
+
+class TestBasic(BaseTestCase):
+    @gen_test
+    def test0(self):
+        sql = "select * from user limit 1"
+        connection = yield self.pool.Connection()
+        cursor = connection.cursor()
+        yield cursor.execute(sql)
+
+        datas = cursor.fetchall()
+        yield cursor.close()
+        connection.close()
+        self.assertIsNotNone(datas)

tests/test_basic.py

@@ -0,0 +1,15 @@
+#!/usr/bin/env python
+# encoding: utf-8
+from tornado.testing import gen_test
+from . import BaseTestCase
+
+
+class TestWithWith(BaseTestCase):
+    @gen_test
+    def test1(self):
+        sql = "select * from user limit 1"
+        with (yield self.pool.Connection()) as connection:
+            with connection.cursor() as cursor:
+                yield cursor.execute(sql)
+                datas = cursor.fetchall()
+                print (datas)

tests/test_with_with.py

@@ -65,7 +65,7 @@ def select_db(self, db):
         return async_call_method(self._connection.select_db, db)
 
     def cursor(self, cursor_cls=None):
-        cursor = self._connection.cursor(cursor_cls.__delegate_class__ if cursor_cls and issubclass(cursor_cls,Cursor) else cursor_cls)
+        cursor = self._connection.cursor(cursor_cls.__delegate_class__ if cursor_cls and issubclass(cursor_cls, Cursor) else cursor_cls)
         if cursor_cls:
             return cursor_cls(cursor)
         else:

tormysql/client.py

@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
 # 14-8-8
 # create by: snower
-
+from tornado.ioloop import IOLoop
 from tornado.concurrent import TracebackFuture
 from pymysql.cursors import Cursor as OriginCursor, DictCursor as OriginDictCursor, SSCursor as OriginSSCursor, SSDictCursor as OriginSSDictCursor
 from .util import async_call_method
 
+
 class Cursor(object):
     __delegate_class__ = OriginCursor
 
@@ -57,13 +58,23 @@ def __iter__(self):
     def __getattr__(self, name):
         return getattr(self._cursor, name)
 
+    def __enter__(self):
+        return self
+
+    def __exit__(self, *args):
+        IOLoop.current().add_callback(self.close)
+
+
 setattr(OriginCursor, "__tormysql_class__", Cursor)
 
+
 class DictCursor(Cursor):
     __delegate_class__ = OriginDictCursor
 
+
 setattr(OriginDictCursor, "__tormysql_class__", DictCursor)
 
+
 class SSCursor(Cursor):
     __delegate_class__ = OriginSSCursor
 

tormysql/cursor.py

@@ -9,10 +9,22 @@
 from tornado.ioloop import IOLoop
 from .client import Client
 
-class ConnectionPoolClosedError(Exception):pass
-class ConnectionNotFoundError(Exception):pass
-class ConnectionNotUsedError(Exception):pass
-class ConnectionUsedError(Exception):pass
+
+class ConnectionPoolClosedError(Exception):
+    pass
+
+
+class ConnectionNotFoundError(Exception):
+    pass
+
+
+class ConnectionNotUsedError(Exception):
+    pass
+
+
+class ConnectionUsedError(Exception):
+    pass
+
 
 class Connection(Client):
     def __init__(self, pool, *args, **kwargs):
@@ -21,11 +33,17 @@ def __init__(self, pool, *args, **kwargs):
         self.used_time = time.time()
         super(Connection, self).__init__(*args, **kwargs)
 
-    def close(self, remote_close = False):
+    def close(self, remote_close=False):
         if remote_close:
             return self.do_close()
         return self._pool.release_connection(self)
 
+    def __enter__(self):
+        return self
+
+    def __exit__(self, *args):
+        IOLoop.current().add_callback(self.close)
+
     def do_close(self):
         return super(Connection, self).close()