From 0fb15ad4ecbd6a22acd54fac1f7900bf048cd176 Mon Sep 17 00:00:00 2001
From: Ryan Williams <rdw@lindenlab.com>
Date: Sun, 7 Feb 2010 11:08:01 -0800
Subject: [PATCH] Tweaked db_pool tests so tpool tests aren't run alongside
 pyevent.  Caught by the continuous build!

---
 tests/db_pool_test.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/tests/db_pool_test.py b/tests/db_pool_test.py
index c70ab8e..308691c 100644
--- a/tests/db_pool_test.py
+++ b/tests/db_pool_test.py
@@ -1,6 +1,6 @@
 "Test cases for db_pool"
 
-from tests import skipped, skip_unless
+from tests import skipped, skip_unless, skip_with_pyevent
 from unittest import TestCase, main
 from eventlet import api
 from eventlet import event
@@ -422,17 +422,16 @@ class TpoolConnectionPool(DBConnectionPool):
             connect_timeout = connect_timeout,
             **self._auth)
             
-            
+
+    @skip_with_pyevent
     def setUp(self):
-        from eventlet import tpool
-        tpool.QUIET = True
         super(TpoolConnectionPool, self).setUp()
         
     def tearDown(self):
-        from eventlet import tpool
-        tpool.QUIET = False
-        tpool.killall()
         super(TpoolConnectionPool, self).tearDown()
+        from eventlet import tpool
+        tpool.killall()
+
 
 
 class RawConnectionPool(DBConnectionPool):