diff options
| author | Ryan Williams <rdw@lindenlab.com> | 2010-02-07 11:08:01 -0800 |
|---|---|---|
| committer | Ryan Williams <rdw@lindenlab.com> | 2010-02-07 11:08:01 -0800 |
| commit | 0fb15ad4ecbd6a22acd54fac1f7900bf048cd176 (patch) | |
| tree | 0fda35ca5280934d7f28d55212cf0ebec15ee366 /tests/db_pool_test.py | |
| parent | ebff4177d2f6ac8663f0c281f4ab18ce80b5e309 (diff) | |
| download | eventlet-0fb15ad4ecbd6a22acd54fac1f7900bf048cd176.tar.gz | |
Tweaked db_pool tests so tpool tests aren't run alongside pyevent. Caught by the continuous build!
Diffstat (limited to 'tests/db_pool_test.py')
| -rw-r--r-- | tests/db_pool_test.py | 11 |
1 files changed, 5 insertions, 6 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): + super(TpoolConnectionPool, self).tearDown() from eventlet import tpool - tpool.QUIET = False tpool.killall() - super(TpoolConnectionPool, self).tearDown() + class RawConnectionPool(DBConnectionPool): |