diff options
| author | Vladyslav Drok <vdrok@mirantis.com> | 2016-09-22 18:15:03 +0300 |
|---|---|---|
| committer | John L. Villalovos <john.l.villalovos@intel.com> | 2016-09-23 08:58:53 -0700 |
| commit | 3bba325c92635d55a7a1a8f256a33a183462b622 (patch) | |
| tree | de55e4023496724ae351c5c3c4e84a2cb64a0289 | |
| parent | 5a5b3dcafa94868e5f0015d4740e770dca722ad5 (diff) | |
| download | ironic-3bba325c92635d55a7a1a8f256a33a183462b622.tar.gz | |
Increase timeout for migration-related tests
Closes-Bug: #1626612
Change-Id: I5836733d916cd04990efa7cf402cca4cfd8b7e24
(cherry picked from commit 8813fc54cd689ec1ea2384e3a9acdb0f4d7d8e8b)
| -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 |