diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-10-06 16:17:48 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-10-06 16:17:48 +0000 |
commit | 500a27dd59261b561082a30749f9a24fdde03cf7 (patch) | |
tree | 4bd6f27d9e4e7b81ab1dfdd926206533256af937 | |
parent | 3f54fec070fdc0e7a63083eb0630b1d37005c30c (diff) | |
parent | 25b5edf00518120ea4dcd0767f5e3b83ee8c377a (diff) | |
download | ironic-500a27dd59261b561082a30749f9a24fdde03cf7.tar.gz |
Merge "Increase timeout for migration-related tests" into stable/newton
-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 bccae40b0..625bfab64 100644 --- a/ironic/tests/unit/db/sqlalchemy/test_migrations.py +++ b/ironic/tests/unit/db/sqlalchemy/test_migrations.py @@ -36,6 +36,7 @@ For postgres on Ubuntu this can be done with the following commands: import collections import contextlib +import fixtures from alembic import script import mock @@ -56,6 +57,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 @@ -212,6 +217,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) @@ -569,6 +576,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 |