diff options
author | Daniele Varrazzo <daniele.varrazzo@gmail.com> | 2013-04-07 00:23:30 +0100 |
---|---|---|
committer | Daniele Varrazzo <daniele.varrazzo@gmail.com> | 2013-04-07 00:23:30 +0100 |
commit | 0e06addc9fa09a40c0406bfae327df6d8dcf7c2e (patch) | |
tree | dd55ac9f7469a200f3919f24391e3885ce9792d7 /tests/test_async.py | |
parent | 408c76fdb67dc80fea108a6484e8c49e87df74c4 (diff) | |
download | psycopg2-0e06addc9fa09a40c0406bfae327df6d8dcf7c2e.tar.gz |
Testing boilerplate unified in a single base class
The class makes a connection always available, allows creating
new connection and closes everything on tear down.
Diffstat (limited to 'tests/test_async.py')
-rwxr-xr-x | tests/test_async.py | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/tests/test_async.py b/tests/test_async.py index b51429f..09604b5 100755 --- a/tests/test_async.py +++ b/tests/test_async.py @@ -32,7 +32,7 @@ import time import select import StringIO -from testconfig import dsn +from testutils import ConnectingTestCase class PollableStub(object): """A 'pollable' wrapper allowing analysis of the `poll()` calls.""" @@ -49,11 +49,13 @@ class PollableStub(object): return rv -class AsyncTests(unittest.TestCase): +class AsyncTests(ConnectingTestCase): def setUp(self): - self.sync_conn = psycopg2.connect(dsn) - self.conn = psycopg2.connect(dsn, async=True) + ConnectingTestCase.setUp(self) + + self.sync_conn = self.conn + self.conn = self.connect(async=True) self.wait(self.conn) @@ -64,10 +66,6 @@ class AsyncTests(unittest.TestCase): )''') self.wait(curs) - def tearDown(self): - self.sync_conn.close() - self.conn.close() - def wait(self, cur_or_conn): pollable = cur_or_conn if not hasattr(pollable, 'poll'): @@ -328,7 +326,7 @@ class AsyncTests(unittest.TestCase): def __init__(self, dsn, async=0): psycopg2.extensions.connection.__init__(self, dsn, async=async) - conn = psycopg2.connect(dsn, connection_factory=MyConn, async=True) + conn = self.connect(connection_factory=MyConn, async=True) self.assert_(isinstance(conn, MyConn)) self.assert_(conn.async) conn.close() |