From 2b0050af2050f9b98d4a3d6a36c8decfc59f32ea Mon Sep 17 00:00:00 2001 From: Rodrigo Duarte Sousa Date: Tue, 14 Feb 2017 10:26:54 -0300 Subject: [PATCH] Rename protocol cascade delete migration file Due the related bug, the file names weren't being correctly processed. This patch renames the files to use different names accordingly to their phases. Renaming the files also enables the possibility of removing the migration from the data_migration banned tests. Change-Id: I2413686cd8c89c88397fd3923fe9491015a8c534 Related-Bug: 1658116 --- ...ntract_protocol_cascade_delete_for_federated_user.py} | 0 ...igrate_protocol_cascade_delete_for_federated_user.py} | 0 ...expand_protocol_cascade_delete_for_federated_user.py} | 0 keystone/tests/unit/test_sql_banned_operations.py | 9 +-------- 4 files changed, 1 insertion(+), 8 deletions(-) rename keystone/common/sql/contract_repo/versions/{013_protocol_cascade_delete_for_federated_user.py => 013_contract_protocol_cascade_delete_for_federated_user.py} (100%) rename keystone/common/sql/data_migration_repo/versions/{013_protocol_cascade_delete_for_federated_user.py => 013_migrate_protocol_cascade_delete_for_federated_user.py} (100%) rename keystone/common/sql/expand_repo/versions/{013_protocol_cascade_delete_for_federated_user.py => 013_expand_protocol_cascade_delete_for_federated_user.py} (100%) diff --git a/keystone/common/sql/contract_repo/versions/013_protocol_cascade_delete_for_federated_user.py b/keystone/common/sql/contract_repo/versions/013_contract_protocol_cascade_delete_for_federated_user.py similarity index 100% rename from keystone/common/sql/contract_repo/versions/013_protocol_cascade_delete_for_federated_user.py rename to keystone/common/sql/contract_repo/versions/013_contract_protocol_cascade_delete_for_federated_user.py diff --git a/keystone/common/sql/data_migration_repo/versions/013_protocol_cascade_delete_for_federated_user.py b/keystone/common/sql/data_migration_repo/versions/013_migrate_protocol_cascade_delete_for_federated_user.py similarity index 100% rename from keystone/common/sql/data_migration_repo/versions/013_protocol_cascade_delete_for_federated_user.py rename to keystone/common/sql/data_migration_repo/versions/013_migrate_protocol_cascade_delete_for_federated_user.py diff --git a/keystone/common/sql/expand_repo/versions/013_protocol_cascade_delete_for_federated_user.py b/keystone/common/sql/expand_repo/versions/013_expand_protocol_cascade_delete_for_federated_user.py similarity index 100% rename from keystone/common/sql/expand_repo/versions/013_protocol_cascade_delete_for_federated_user.py rename to keystone/common/sql/expand_repo/versions/013_expand_protocol_cascade_delete_for_federated_user.py diff --git a/keystone/tests/unit/test_sql_banned_operations.py b/keystone/tests/unit/test_sql_banned_operations.py index 3452f350a8..c7c9420cee 100644 --- a/keystone/tests/unit/test_sql_banned_operations.py +++ b/keystone/tests/unit/test_sql_banned_operations.py @@ -281,14 +281,7 @@ class TestKeystoneDataMigrations( # timestamp to datetime and updates the initial value in the contract # phase. Adding an exception here to pass data migrations banned tests, # otherwise fails. - 4, - # Migration 013 updates a foreign key constraint at the federated_user - # table. It is a composite key pointing to the procotol.id and - # protocol.idp_id columns. Since we can't create a new foreign key - # before dropping the old one and the operations happens in the same - # upgrade phase, adding an exception here to pass the data migration - # banned tests. - 13 + 4 ] def setUp(self):