Merge "Increase timeout for migration-related tests" into stable/mitaka

1 files changed, 12 insertions, 0 deletions

diff --git a/ironic/tests/unit/db/sqlalchemy/test_migrations.py b/ironic/tests/unit/db/sqlalchemy/test_migrations.py
index 9d89b232e..00993636c 100644
--- a/ironic/tests/unit/db/sqlalchemy/test_migrations.py
+++ b/ironic/tests/unit/db/sqlalchemy/test_migrations.py
@@ -35,6 +35,7 @@ For postgres on Ubuntu this can be done with the following commands:
 """
 
 import contextlib
+import fixtures
 
 from alembic import script
 import mock
@@ -55,6 +56,10 @@ from ironic.tests import base
 
 LOG = logging.getLogger(__name__)
 
+# NOTE(vdrok): This was introduced after migration tests started taking more
+# time in gate
+MIGRATIONS_TIMEOUT = 300
+
 
 def _get_connect_string(backend, user, passwd, database):
     """Get database connection
@@ -211,6 +216,8 @@ class MigrationCheckersMixin(object):
         super(MigrationCheckersMixin, self).setUp()
         self.config = migration._alembic_config()
         self.migration_api = migration
+        self.useFixture(fixtures.Timeout(MIGRATIONS_TIMEOUT,
+                                         gentle=True))
 
     def test_walk_versions(self):
         self._walk_versions(self.engine, self.config)
@@ -453,6 +460,11 @@ class TestMigrationsPostgreSQL(MigrationCheckersMixin,
 
 class ModelsMigrationSyncMixin(object):
 
+    def setUp(self):
+        super(ModelsMigrationSyncMixin, self).setUp()
+        self.useFixture(fixtures.Timeout(MIGRATIONS_TIMEOUT,
+                                         gentle=True))
+
     def get_metadata(self):
         return models.Base.metadata