make test_db_dbspec's thread-leak-protection better, and stop leaking…

… threads
djmitche · Mar 2, 2010 · 9c01344 · 9c01344
1 parent 5505f59
commit 9c01344
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/buildbot/test/unit/test_db_connector.py b/buildbot/test/unit/test_db_connector.py
@@ -20,7 +20,7 @@ def setUp(self):
     def tearDown(self):
         self.dbc.stop()
         # double-check we haven't left a ThreadPool open
-        assert len(threading.enumerate()) - self.start_thdcount < 2
+        assert len(threading.enumerate()) - self.start_thdcount < 1
 
     def test_quoteq_format(self):
         self.dbc.paramstyle = "format" # override default

diff --git a/buildbot/test/unit/test_db_dbspec.py b/buildbot/test/unit/test_db_dbspec.py
@@ -131,13 +131,14 @@ class DBSpec_methods(unittest.TestCase):
     def setUp(self):
         self.spec = dbspec.DBSpec.from_url("sqlite://")
         self.pools = []
+        self.start_thdcount = len(threading.enumerate())
 
     def tearDown(self):
         # be careful to stop all pools
         for pool in self.pools:
-            pool.stop()
+            pool.close()
         # double-check we haven't left a ThreadPool open
-        assert len(threading.enumerate()) < 4
+        assert len(threading.enumerate()) - self.start_thdcount < 1
 
     # track a pool that must be closed
     def trackPool(self, pool):
@@ -155,4 +156,7 @@ def test_get_sync_connection_has_cursor(self):
         self.assertTrue(hasattr(self.spec.get_sync_connection(), 'cursor'))
 
     def test_get_async_connection_pool_has_runInteraction(self):
-        self.assertTrue(hasattr(self.spec.get_async_connection_pool(), 'runInteraction'))
+        pool = self.spec.get_async_connection_pool()
+        self.trackPool(pool)
+        pool.start()
+        self.assertTrue(hasattr(pool, 'runInteraction'))