diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-02-27 00:39:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-02-27 00:39:07 +0000 |
| commit | 9663fa86d691c5ae30aacbf50fe58be13789918d (patch) | |
| tree | 3e205df9c67be2bc17aff6b6fd1a31ed0028bbb4 | |
| parent | 0b5685962c4535e42493be483bb0c4a0fe39de6a (diff) | |
| parent | 4d505e63902bd31e40904a0c9045b9b07d5bdb5a (diff) | |
| download | keystone-9663fa86d691c5ae30aacbf50fe58be13789918d.tar.gz | |
Merge "Fix issue with DB upgrade to assignment table"
| -rw-r--r-- | keystone/common/sql/migrate_repo/versions/039_grant_to_assignment.py | 1 | ||||
| -rw-r--r-- | keystone/tests/test_sql_upgrade.py | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/keystone/common/sql/migrate_repo/versions/039_grant_to_assignment.py b/keystone/common/sql/migrate_repo/versions/039_grant_to_assignment.py index df4985839..9b43331bd 100644 --- a/keystone/common/sql/migrate_repo/versions/039_grant_to_assignment.py +++ b/keystone/common/sql/migrate_repo/versions/039_grant_to_assignment.py @@ -205,6 +205,7 @@ def downgrade_assignment_table(meta, migrate_engine): update = build_update(meta, session, assignment) if update is not None: migrate_engine.execute(update) + session.commit() # Delete all the rows migrate_engine.execute(downgrade_table.delete()) diff --git a/keystone/tests/test_sql_upgrade.py b/keystone/tests/test_sql_upgrade.py index 3b20b7903..8b22fdda7 100644 --- a/keystone/tests/test_sql_upgrade.py +++ b/keystone/tests/test_sql_upgrade.py @@ -1997,22 +1997,28 @@ class SqlUpgradeTests(SqlMigrateBase): check_assignment_type(refs, assignment_sql.AssignmentType.USER_DOMAIN) - session = self.Session() self.upgrade(37) + session = self.Session() self.assertTableDoesNotExist('assignment') base_data = create_base_data(session) populate_grants(session, base_data) check_grants(session, base_data) + session.commit() + session.close() self.upgrade(40) + session = self.Session() self.assertTableExists('assignment') self.assertTableDoesNotExist('user_project_metadata') self.assertTableDoesNotExist('group_project_metadata') self.assertTableDoesNotExist('user_domain_metadata') self.assertTableDoesNotExist('group_domain__metadata') check_assignments(session, base_data) + session.close() self.downgrade(37) + session = self.Session() self.assertTableDoesNotExist('assignment') check_grants(session, base_data) + session.close() def populate_user_table(self, with_pass_enab=False, with_pass_enab_domain=False): |