summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2011-02-09 19:18:33 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2011-02-09 19:18:33 -0500
commit311fa4f8766c7cdecc7ec08aba57692611060c95 (patch)
treebf93b55c0103d8df80112e33b43211ead80caf29
parent7e8f35109725ed3fd3caf96acf8b94a13c53fdfe (diff)
downloadsqlalchemy-311fa4f8766c7cdecc7ec08aba57692611060c95.tar.gz
- py3k fix regarding new exception system
- this test keeps throwing a TNS error on Oracle on the buildbot only, runs locally, seems to be related to some scaling/memory type of issue on the bot
-rw-r--r--lib/sqlalchemy/engine/strategies.py2
-rw-r--r--test/engine/test_transaction.py1
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/sqlalchemy/engine/strategies.py b/lib/sqlalchemy/engine/strategies.py
index 06bf1126f..c2c21812b 100644
--- a/lib/sqlalchemy/engine/strategies.py
+++ b/lib/sqlalchemy/engine/strategies.py
@@ -81,7 +81,7 @@ class DefaultEngineStrategy(EngineStrategy):
except Exception, e:
# Py3K
#raise exc.DBAPIError.instance(None, None,
- # dialect.dbapi.Error, e) from e
+ # e, dialect.dbapi.Error) from e
# Py2K
import sys
raise exc.DBAPIError.instance(
diff --git a/test/engine/test_transaction.py b/test/engine/test_transaction.py
index 1c94d1f5f..c4aec7e37 100644
--- a/test/engine/test_transaction.py
+++ b/test/engine/test_transaction.py
@@ -542,6 +542,7 @@ class TLTransactionTest(TestBase):
tlengine.close()
+ @testing.crashes('oracle', 'TNS error of unknown origin occurs on the buildbot.')
def test_rollback_no_trans(self):
tlengine = create_engine(testing.db.url, strategy="threadlocal")