diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-09-15 15:08:42 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-09-15 15:08:42 +0000 |
commit | 4de33ebd504a2c3dbddc2492bdb96ae7bca77d66 (patch) | |
tree | c531d8e0549798fadcc70e0f8d5c2c3c7411c192 | |
parent | 731955009dbfaf323df0e53a87e3eb7a35dc399d (diff) | |
parent | 9a5a3b3395d1dfb754652fbe8deaba6c25e0ea28 (diff) | |
download | oslo-db-4de33ebd504a2c3dbddc2492bdb96ae7bca77d66.tar.gz |
Merge "Throw DBMigrationError instead of DbMigrationError."4.27.0
-rw-r--r-- | oslo_db/sqlalchemy/migration.py | 2 | ||||
-rw-r--r-- | oslo_db/tests/sqlalchemy/test_migration_common.py | 6 |
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) |