Update dependencies and tests

requirements.txt

@@ -1,3 +1,3 @@
-queries>=1.3.0
+queries>=1.4.0
 sprockets>=0.1.1
 tornado>=4.0.1

test-requirements.txt

@@ -1,3 +1,4 @@
 coverage>=3.7,<4
 coveralls>=0.4,<1
 nose>=1.3,<2
+mock>=1.0.1

tests.py

@@ -10,6 +10,7 @@
 except ImportError:
     import unittest
 
+from tornado import gen
 from sprockets.clients import postgresql
 import queries
 from tornado import testing
@@ -80,6 +81,7 @@ def setUp(self):
         os.environ['TEST4_PORT'] = '5432'
         os.environ['TEST4_DBNAME'] = 'postgres'
         os.environ['TEST4_USER'] = 'postgres'
+
         try:
             self.session = postgresql.Session('test', pool_max_size=10)
         except postgresql.OperationalError as error:
@@ -115,44 +117,61 @@ def test_callproc_mod_result_value(self):
 class TornadoSessionIntegrationTests(testing.AsyncTestCase):
 
     def setUp(self):
-        self.io_loop = self.get_new_ioloop()
+        super(TornadoSessionIntegrationTests, self).setUp()
         os.environ['TEST5_HOST'] = 'localhost'
         os.environ['TEST5_PORT'] = '5432'
         os.environ['TEST5_DBNAME'] = 'postgres'
         os.environ['TEST5_USER'] = 'postgres'
-        try:
-            self.session = postgresql.TornadoSession('test',
-                                                     pool_max_size=10,
-                                                     io_loop=self.io_loop)
-        except postgresql.OperationalError as error:
-            raise unittest.SkipTest(str(error).split('\n')[0])
+        self.session = postgresql.TornadoSession('test',
+                                                 pool_max_size=10,
+                                                 io_loop=self.io_loop)
 
-    def tearDown(self):
-        for key in ['HOST', 'PORT', 'DBNAME', 'USER']:
-            del os.environ['TEST5_%s' % key]
+    #def tearDown(self):
+    #    for key in ['HOST', 'PORT', 'DBNAME', 'USER']:
+    #        del os.environ['TEST5_%s' % key]
 
     @testing.gen_test
     def test_query_returns_results_object(self):
-        result = yield self.session.query('SELECT 1 AS value')
+        try:
+            result = yield self.session.query('SELECT 1 AS value')
+        except postgresql.OperationalError:
+            raise unittest.SkipTest('PostgreSQL is not running')
         self.assertIsInstance(result, queries.Results)
+        result.free()
 
     @testing.gen_test
     def test_query_result_value(self):
-        result = yield self.session.query('SELECT 1 AS value')
+        try:
+            result = yield self.session.query('SELECT 1 AS value')
+        except postgresql.OperationalError:
+            raise unittest.SkipTest('PostgreSQL is not running')
         self.assertDictEqual(result.as_dict(), {'value': 1})
+        result.free()
 
     @testing.gen_test
     def test_query_multirow_result_has_at_least_three_rows(self):
-        result = yield self.session.query('SELECT * FROM pg_stat_database')
+        try:
+            result = yield self.session.query('SELECT * FROM pg_stat_database')
+        except postgresql.OperationalError:
+            raise unittest.SkipTest('PostgreSQL is not running')
         self.assertGreaterEqual(result.count(), 3)
+        result.free()
 
     @testing.gen_test
     def test_callproc_returns_results_object(self):
         timestamp = int(datetime.datetime.now().strftime('%s'))
-        result = yield self.session.callproc('to_timestamp', [timestamp])
+        try:
+            result = yield self.session.callproc('to_timestamp', [timestamp])
+        except postgresql.OperationalError:
+            raise unittest.SkipTest('PostgreSQL is not running')
         self.assertIsInstance(result, queries.Results)
+        result.free()
 
     @testing.gen_test
     def test_callproc_mod_result_value(self):
-        result = yield self.session.callproc('mod', [6, 4])
+        try:
+            result = yield self.session.callproc('mod', [6, 4])
+        except postgresql.OperationalError:
+            raise unittest.SkipTest('PostgreSQL is not running')
         self.assertEqual(6 % 4, result[0]['mod'])
+        result.free()