diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-05-30 14:00:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-05-30 14:00:31 +0000 |
| commit | aac6276c6958490255202343aaf777a872304f13 (patch) | |
| tree | 127ea5d85ec9cd69225dd8f72a99da792461b47c | |
| parent | 821f94c5466d5e43a398a46246160d5a4b44a629 (diff) | |
| parent | a6172924d5fce8aca4a2a718e2a1f45df6f81372 (diff) | |
| download | oslo-db-aac6276c6958490255202343aaf777a872304f13.tar.gz | |
Merge "Raise only DbMigrationError from migrate 'upgrade' method"
| -rw-r--r-- | oslo_db/sqlalchemy/migration.py | 5 | ||||
| -rw-r--r-- | oslo_db/tests/sqlalchemy/test_migration_common.py | 16 |
2 files changed, 20 insertions, 1 deletions
diff --git a/oslo_db/sqlalchemy/migration.py b/oslo_db/sqlalchemy/migration.py index f6a4d55..457dd35 100644 --- a/oslo_db/sqlalchemy/migration.py +++ b/oslo_db/sqlalchemy/migration.py @@ -75,7 +75,10 @@ def db_sync(engine, abs_path, version=None, init_version=0, sanity_check=True): if sanity_check: _db_schema_sanity_check(engine) if version is None or version > current_version: - migration = versioning_api.upgrade(engine, repository, version) + try: + migration = versioning_api.upgrade(engine, repository, version) + except Exception as 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 95d031e..870f208 100644 --- a/oslo_db/tests/sqlalchemy/test_migration_common.py +++ b/oslo_db/tests/sqlalchemy/test_migration_common.py @@ -192,6 +192,22 @@ class TestMigrationCommon(test_base.DbTestCase): self.assertRaises(db_exception.DBMigrationError, migration.db_sync, self.engine, self.path, 'foo') + @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. + upgrade.side_effect = migrate_exception.VersionNotFoundError + 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, + migration.db_sync, self.engine, self.path, + self.test_version + 1) + def test_db_sync_upgrade(self): init_ver = 55 with test_utils.nested( |