From 40653eac50de22d3838349ce80be8ac7b3e2fbcc Mon Sep 17 00:00:00 2001 From: Yaguo Zhou Date: Tue, 5 Sep 2017 23:13:12 +0800 Subject: [PATCH] Replace DbMigrationError with DBMigrationError because DbMigrationError is deprecated Change-Id: I9fb20315c8451c590bce00167e9bd4c0c176b3aa --- keystone/cmd/cli.py | 6 +++--- keystone/common/sql/upgrades.py | 4 ++-- keystone/tests/unit/test_cli.py | 2 +- keystone/tests/unit/test_sql_upgrade.py | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/keystone/cmd/cli.py b/keystone/cmd/cli.py index 83fe7724ee..a75d91be5a 100644 --- a/keystone/cmd/cli.py +++ b/keystone/cmd/cli.py @@ -458,7 +458,7 @@ class DbSync(BaseApp): status = 0 try: expand_version = upgrades.get_db_version(repo='expand_repo') - except migration.exception.DbMigrationError: + except migration.exception.DBMigrationError: LOG.info('Your database is not currently under version ' 'control or the database is already controlled. Your ' 'first step is to run `keystone-manage db_sync ' @@ -467,11 +467,11 @@ class DbSync(BaseApp): try: migrate_version = upgrades.get_db_version( repo='data_migration_repo') - except migration.exception.DbMigrationError: + except migration.exception.DBMigrationError: migrate_version = 0 try: contract_version = upgrades.get_db_version(repo='contract_repo') - except migration.exception.DbMigrationError: + except migration.exception.DBMigrationError: contract_version = 0 repo = migrate.versioning.repository.Repository( diff --git a/keystone/common/sql/upgrades.py b/keystone/common/sql/upgrades.py index 0e4066792e..45054d945c 100644 --- a/keystone/common/sql/upgrades.py +++ b/keystone/common/sql/upgrades.py @@ -179,7 +179,7 @@ def _sync_repo(repo_name): # an exception that we can safely ignore try: migration.db_version_control(engine, abs_path) - except (migration.exception.DbMigrationError, + except (migration.exception.DBMigrationError, exceptions.DatabaseAlreadyControlledError): # nosec pass init_version = get_init_version(abs_path=abs_path) @@ -214,7 +214,7 @@ def _assert_not_schema_downgrade(version=None): try: current_ver = int(six.text_type(get_db_version())) if int(version) < current_ver: - raise migration.exception.DbMigrationError( + raise migration.exception.DBMigrationError( _("Unable to downgrade schema")) except exceptions.DatabaseNotControlledError: # nosec # NOTE(morganfainberg): The database is not controlled, this action diff --git a/keystone/tests/unit/test_cli.py b/keystone/tests/unit/test_cli.py index 08f16c839d..7ed44a812b 100644 --- a/keystone/tests/unit/test_cli.py +++ b/keystone/tests/unit/test_cli.py @@ -682,7 +682,7 @@ class CliDBSyncTestCase(unit.BaseTestCase): @mock.patch('keystone.cmd.cli.upgrades.get_db_version') def test_db_sync_check_when_database_is_empty(self, mocked_get_db_version): - e = migration.exception.DbMigrationError("Invalid version") + e = migration.exception.DBMigrationError("Invalid version") mocked_get_db_version.side_effect = e checker = cli.DbSync() diff --git a/keystone/tests/unit/test_sql_upgrade.py b/keystone/tests/unit/test_sql_upgrade.py index 2e1a0ccb50..9176c821e7 100644 --- a/keystone/tests/unit/test_sql_upgrade.py +++ b/keystone/tests/unit/test_sql_upgrade.py @@ -1600,7 +1600,7 @@ class VersionTests(SqlMigrateBase): def test_assert_not_schema_downgrade(self): self.upgrade() self.assertRaises( - db_exception.DbMigrationError, + db_exception.DBMigrationError, upgrades._sync_common_repo, self.repos[LEGACY_REPO].max_version - 1)