From 743f15e0c72e6c5b51b5543f89ee2533d1d94845 Mon Sep 17 00:00:00 2001 From: Chris Behrens Date: Fri, 22 Feb 2013 16:13:27 +0000 Subject: Clean up sqlalchemy exception code Moves DB exceptions that can be shared between DB implementations into their own module. Adds DBDeadlock() exception wrapping. Nova has its own code for determining Deadlock and it's better to consolidate it with DBDuplicateKey checking. Change-Id: I108bd0da2a14d62e460a997b1472f0b65bfc9b95 --- tests/unit/db/sqlalchemy/test_sqlalchemy.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'tests/unit/db/sqlalchemy/test_sqlalchemy.py') diff --git a/tests/unit/db/sqlalchemy/test_sqlalchemy.py b/tests/unit/db/sqlalchemy/test_sqlalchemy.py index 6b84f10..90a048e 100644 --- a/tests/unit/db/sqlalchemy/test_sqlalchemy.py +++ b/tests/unit/db/sqlalchemy/test_sqlalchemy.py @@ -20,18 +20,11 @@ from sqlalchemy import Column, MetaData, Table, UniqueConstraint from sqlalchemy.ext.declarative import declarative_base from sqlalchemy import DateTime, Integer +from openstack.common.db import exception as db_exc from openstack.common.db.sqlalchemy import models from openstack.common.db.sqlalchemy import session -from openstack.common import importutils from tests import utils as test_utils -MySQLdb = importutils.try_import('MySQLdb') - - -class TestException(Exception): - pass - - BASE = declarative_base() _TABLE_NAME = '__tmp__test__tmp__' @@ -72,7 +65,7 @@ class SessionErrorWrapperTestCase(test_utils.BaseTestCase): tbl2 = TmpTable() tbl2.update({'foo': 10}) - self.assertRaises(session.DBDuplicateEntry, tbl2.save) + self.assertRaises(db_exc.DBDuplicateEntry, tbl2.save) def test_execute_wrapper(self): _session = session.get_session() @@ -85,5 +78,5 @@ class SessionErrorWrapperTestCase(test_utils.BaseTestCase): method = _session.query(TmpTable).\ filter_by(foo=10).\ update - self.assertRaises(session.DBDuplicateEntry, + self.assertRaises(db_exc.DBDuplicateEntry, method, {'foo': 20}) -- cgit