Add time_type dictionary to test_migrations

A number of postgresql migration tests fail because the test case
is verifying that an sqlalchemy.types.DATETIME column was created.
When the column type is checked, however, postgresql reports the type as
sqlalchemy.types.TIMESTAMP.  The mismatch causes numerous
test cases to fail for postgresql.

This creates a dictionary for each engine being tested to handle the
different time types.

Change-Id: Ic9921ff9fda001a66c0ea3a6a75c8adefa60b107
Closes-bug: 1262426

diff --git a/cinder/tests/test_migrations.py b/cinder/tests/test_migrations.py
index 26ebf68cdfa2a649d82d3728e61d1144e14c41ba..4ca4799e7311004f883f37b2fd2e5aadbb0de052 100644 (file)
--- a/cinder/tests/test_migrations.py
+++ b/cinder/tests/test_migrations.py
@@ -150,10 +150,14 @@ class TestMigrations(test.TestCase):
         # Set-up a dict of types for those column types that
         # are not uniform for all databases.
         self.bool_type = {}
+        self.time_type = {}
         for (key, engine) in self.engines.items():
             self.bool_type[engine.name] = sqlalchemy.types.BOOLEAN
+            self.time_type[engine.name] = sqlalchemy.types.DATETIME
             if engine.name == 'mysql':
                 self.bool_type[engine.name] = sqlalchemy.dialects.mysql.TINYINT
+            if engine.name == 'postgresql':
+                self.time_type[engine.name] = sqlalchemy.types.TIMESTAMP
 
         # We start each test case with a completely blank slate.
         self._reset_databases()
@@ -563,11 +567,11 @@ class TestMigrations(test.TestCase):
                                        autoload=True)
 
             self.assertIsInstance(backups.c.created_at.type,
-                                  sqlalchemy.types.DATETIME)
+                                  self.time_type[engine.name])
             self.assertIsInstance(backups.c.updated_at.type,
-                                  sqlalchemy.types.DATETIME)
+                                  self.time_type[engine.name])
             self.assertIsInstance(backups.c.deleted_at.type,
-                                  sqlalchemy.types.DATETIME)
+                                  self.time_type[engine.name])
             self.assertIsInstance(backups.c.deleted.type,
                                   self.bool_type[engine.name])
             self.assertIsInstance(backups.c.id.type,
@@ -625,11 +629,11 @@ class TestMigrations(test.TestCase):
                                                  autoload=True)
 
             self.assertIsInstance(snapshot_metadata.c.created_at.type,
-                                  sqlalchemy.types.DATETIME)
+                                  self.time_type[engine.name])
             self.assertIsInstance(snapshot_metadata.c.updated_at.type,
-                                  sqlalchemy.types.DATETIME)
+                                  self.time_type[engine.name])
             self.assertIsInstance(snapshot_metadata.c.deleted_at.type,
-                                  sqlalchemy.types.DATETIME)
+                                  self.time_type[engine.name])
             self.assertIsInstance(snapshot_metadata.c.deleted.type,
                                   self.bool_type[engine.name])
             self.assertIsInstance(snapshot_metadata.c.deleted.type,
@@ -666,11 +670,11 @@ class TestMigrations(test.TestCase):
                                          autoload=True)
 
             self.assertIsInstance(transfers.c.created_at.type,
-                                  sqlalchemy.types.DATETIME)
+                                  self.time_type[engine.name])
             self.assertIsInstance(transfers.c.updated_at.type,
-                                  sqlalchemy.types.DATETIME)
+                                  self.time_type[engine.name])
             self.assertIsInstance(transfers.c.deleted_at.type,
-                                  sqlalchemy.types.DATETIME)
+                                  self.time_type[engine.name])
             self.assertIsInstance(transfers.c.deleted.type,
                                   self.bool_type[engine.name])
             self.assertIsInstance(transfers.c.id.type,
@@ -684,7 +688,7 @@ class TestMigrations(test.TestCase):
             self.assertIsInstance(transfers.c.crypt_hash.type,
                                   sqlalchemy.types.VARCHAR)
             self.assertIsInstance(transfers.c.expires_at.type,
-                                  sqlalchemy.types.DATETIME)
+                                  self.time_type[engine.name])
 
             migration_api.downgrade(engine, TestMigrations.REPOSITORY, 9)
 
@@ -927,11 +931,11 @@ class TestMigrations(test.TestCase):
                                          metadata,
                                          autoload=True)
             self.assertIsInstance(qos_specs.c.created_at.type,
-                                  sqlalchemy.types.DATETIME)
+                                  self.time_type[engine.name])
             self.assertIsInstance(qos_specs.c.updated_at.type,
-                                  sqlalchemy.types.DATETIME)
+                                  self.time_type[engine.name])
             self.assertIsInstance(qos_specs.c.deleted_at.type,
-                                  sqlalchemy.types.DATETIME)
+                                  self.time_type[engine.name])
             self.assertIsInstance(qos_specs.c.deleted.type,
                                   self.bool_type[engine.name])
             self.assertIsInstance(qos_specs.c.id.type,
@@ -993,11 +997,11 @@ class TestMigrations(test.TestCase):
                                                      autoload=True)
 
             self.assertIsInstance(volume_admin_metadata.c.created_at.type,
-                                  sqlalchemy.types.DATETIME)
+                                  self.time_type[engine.name])
             self.assertIsInstance(volume_admin_metadata.c.updated_at.type,
-                                  sqlalchemy.types.DATETIME)
+                                  self.time_type[engine.name])
             self.assertIsInstance(volume_admin_metadata.c.deleted_at.type,
-                                  sqlalchemy.types.DATETIME)
+                                  self.time_type[engine.name])
             self.assertIsInstance(volume_admin_metadata.c.deleted.type,
                                   self.bool_type[engine.name])
             self.assertIsInstance(volume_admin_metadata.c.id.type,