diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-10-06 16:17:57 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-10-06 16:17:57 +0000 |
commit | 4a8537b2f3e9627b4d1532594c46e169699a41b8 (patch) | |
tree | 85de44e7203fc9afc7df798d667c6a8c537dfd54 | |
parent | 0607b70660ecd314e7c9d9ca9330c131fc0535b6 (diff) | |
parent | 3bba325c92635d55a7a1a8f256a33a183462b622 (diff) | |
download | ironic-4a8537b2f3e9627b4d1532594c46e169699a41b8.tar.gz |
Merge "Increase timeout for migration-related tests" into stable/mitaka
-rw-r--r-- | ironic/tests/unit/db/sqlalchemy/test_migrations.py | 12 |
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 |