From 1f93ae0c8de981d342b94258a14097f168e5536e Mon Sep 17 00:00:00 2001 From: Boris Bobrov Date: Mon, 12 Jan 2015 17:05:18 +0300 Subject: [PATCH] Fix downgrade test for migration 61 on non-sqlite One of the downgrade tests was failing on non-sqlite because of foreign key constraint violation. Change-Id: I6f85e1040ffd6e6d3222cf2c2a9bce4875f6a95f Closes-Bug: 1409716 Partial-Bug: 1408658 --- keystone/tests/test_sql_upgrade.py | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/keystone/tests/test_sql_upgrade.py b/keystone/tests/test_sql_upgrade.py index 0422355fa1..8c4cdb80ab 100644 --- a/keystone/tests/test_sql_upgrade.py +++ b/keystone/tests/test_sql_upgrade.py @@ -1479,22 +1479,26 @@ class SqlUpgradeTests(SqlMigrateBase): # make sure that the parent_id field is dropped in the downgrade self.upgrade(61) session = self.Session() - beta = { - 'id': uuid.uuid4().hex, - 'description': uuid.uuid4().hex, - 'domain_id': uuid.uuid4().hex, - 'name': uuid.uuid4().hex, - 'parent_id': uuid.uuid4().hex - } + domain = {'id': uuid.uuid4().hex, + 'name': uuid.uuid4().hex, + 'enabled': True} acme = { 'id': uuid.uuid4().hex, 'description': uuid.uuid4().hex, - 'domain_id': uuid.uuid4().hex, + 'domain_id': domain['id'], 'name': uuid.uuid4().hex, 'parent_id': None } - self.insert_dict(session, 'project', beta) + beta = { + 'id': uuid.uuid4().hex, + 'description': uuid.uuid4().hex, + 'domain_id': domain['id'], + 'name': uuid.uuid4().hex, + 'parent_id': acme['id'] + } + self.insert_dict(session, 'domain', domain) self.insert_dict(session, 'project', acme) + self.insert_dict(session, 'project', beta) proj_table = sqlalchemy.Table('project', self.metadata, autoload=True) self.assertEqual(2, session.query(proj_table).count()) session.close()