diff options
author | Federico Di Gregorio <fog@initd.org> | 2011-05-11 09:58:49 +0200 |
---|---|---|
committer | Federico Di Gregorio <fog@initd.org> | 2011-05-11 09:58:49 +0200 |
commit | ab685c2fc0a04651041957af7419a1ecfeeb9e53 (patch) | |
tree | 409828624d0d78257928497c22951c206e099265 /tests/__init__.py | |
parent | 29f83f05c4f6565ea67d8b5424b1ec66d55c0858 (diff) | |
parent | 9080b30741e9a6f6b80a6700197445bff48df917 (diff) | |
download | psycopg2-ab685c2fc0a04651041957af7419a1ecfeeb9e53.tar.gz |
Merge branch 'devel'2_4_1
Diffstat (limited to 'tests/__init__.py')
-rwxr-xr-x | tests/__init__.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/__init__.py b/tests/__init__.py index 2eaf6ce..a057527 100755 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -27,17 +27,6 @@ import sys from testconfig import dsn from testutils import unittest -# If connection to test db fails, bail out early. -import psycopg2 -try: - cnn = psycopg2.connect(dsn) -except Exception, e: - print "Failed connection to test db:", e.__class__.__name__, e - print "Please set env vars 'PSYCOPG2_TESTDB*' to valid values." - sys.exit(1) -else: - cnn.close() - import bug_gc import bugX000 import extras_dictcursor @@ -57,6 +46,17 @@ import test_green import test_cancel def test_suite(): + # If connection to test db fails, bail out early. + import psycopg2 + try: + cnn = psycopg2.connect(dsn) + except Exception, e: + print "Failed connection to test db:", e.__class__.__name__, e + print "Please set env vars 'PSYCOPG2_TESTDB*' to valid values." + sys.exit(1) + else: + cnn.close() + suite = unittest.TestSuite() suite.addTest(bug_gc.test_suite()) suite.addTest(bugX000.test_suite()) |