Merge "Add unit test for db_sync run out of order"

keystone/common/sql/upgrades.py

@@ -253,10 +253,10 @@ def offline_sync_database_to_version(version=None):
         contract_schema()
 
 
-def get_db_version():
+def get_db_version(repo=LEGACY_REPO):
     with sql.session_for_read() as session:
         return migration.db_version(
-            session.get_bind(), find_repo(LEGACY_REPO), get_init_version())
+            session.get_bind(), find_repo(repo), get_init_version())
 
 
 def expand_schema():

keystone/tests/unit/test_sql_upgrade.py

@@ -1656,6 +1656,21 @@ class FullMigration(SqlMigrateBase, unit.TestCase):
         # Upgrade the legacy repository
         self.upgrade()
 
+    def test_that_running_upgrades_out_of_order_passes(self):
+        # Currently, an operator can run db_sync operations out of order
+        # without an error or exception being raised. If this gets fixed in
+        # the future to force expand, migrate, contract to be run in order,
+        # then you may change this test to reflect that.
+        self.contract(2)
+        self.expand(1)
+        self.migrate(1)
+        expand = upgrades.get_db_version('expand_repo')
+        migrate = upgrades.get_db_version('data_migration_repo')
+        contract = upgrades.get_db_version('contract_repo')
+        self.assertTrue(2, contract)
+        self.assertTrue(1, expand)
+        self.assertTrue(1, migrate)
+
     def test_migration_002_password_created_at_not_nullable(self):
         # upgrade each repository to 001
         self.expand(1)