summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYaguo Zhou <zhouyaguo@gmail.com>2017-09-08 11:54:09 +0800
committerYaguo Zhou <zhouyaguo@gmail.com>2017-09-08 11:54:09 +0800
commit9a5a3b3395d1dfb754652fbe8deaba6c25e0ea28 (patch)
tree18a349f1257aa6610e1cf751a001e8afd231a5b5
parente9a9701d54ea1b708e7fc3ef68e75eb288059632 (diff)
downloadoslo-db-9a5a3b3395d1dfb754652fbe8deaba6c25e0ea28.tar.gz
Throw DBMigrationError instead of DbMigrationError.
Stop throwing the deprecated DbMigrationError exception, Use the new DBMigrationError exception instead, so that the consumers can catch the new exception. DbMigrationError will not be removed until no consumers still use it. Change-Id: Iab0566cf9f4552e91fa417e64472fa106e8bc86d
-rw-r--r--oslo_db/sqlalchemy/migration.py2
-rw-r--r--oslo_db/tests/sqlalchemy/test_migration_common.py6
2 files changed, 4 insertions, 4 deletions
diff --git a/oslo_db/sqlalchemy/migration.py b/oslo_db/sqlalchemy/migration.py
index 457dd35..31a6105 100644
--- a/oslo_db/sqlalchemy/migration.py
+++ b/oslo_db/sqlalchemy/migration.py
@@ -78,7 +78,7 @@ def db_sync(engine, abs_path, version=None, init_version=0, sanity_check=True):
try:
migration = versioning_api.upgrade(engine, repository, version)
except Exception as ex:
- raise exception.DbMigrationError(ex)
+ raise exception.DBMigrationError(ex)
else:
migration = versioning_api.downgrade(engine, repository,
version)
diff --git a/oslo_db/tests/sqlalchemy/test_migration_common.py b/oslo_db/tests/sqlalchemy/test_migration_common.py
index 870f208..3f5f8ff 100644
--- a/oslo_db/tests/sqlalchemy/test_migration_common.py
+++ b/oslo_db/tests/sqlalchemy/test_migration_common.py
@@ -195,16 +195,16 @@ class TestMigrationCommon(test_base.DbTestCase):
@mock.patch.object(versioning_api, 'upgrade')
def test_db_sync_script_not_present(self, upgrade):
# For non existent migration script file sqlalchemy-migrate will raise
- # VersionNotFoundError which will be wrapped in DbMigrationError.
+ # VersionNotFoundError which will be wrapped in DBMigrationError.
upgrade.side_effect = migrate_exception.VersionNotFoundError
- self.assertRaises(db_exception.DbMigrationError,
+ self.assertRaises(db_exception.DBMigrationError,
migration.db_sync, self.engine, self.path,
self.test_version + 1)
@mock.patch.object(versioning_api, 'upgrade')
def test_db_sync_known_error_raised(self, upgrade):
upgrade.side_effect = migrate_exception.KnownError
- self.assertRaises(db_exception.DbMigrationError,
+ self.assertRaises(db_exception.DBMigrationError,
migration.db_sync, self.engine, self.path,
self.test_version + 1)