diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-30 09:37:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-30 09:37:22 +0000 |
| commit | 7733f9604da91b466a3620335e4bdaa94cba0938 (patch) | |
| tree | ef6a303a5e46ebe13b62e60254126a7ef69af77a | |
| parent | 66649170b762561efc4235dd7b5ee06aa8bcc8e3 (diff) | |
| parent | 897498eee2a0da971e1c6990bee256564ce7334c (diff) | |
| download | oslo-db-7733f9604da91b466a3620335e4bdaa94cba0938.tar.gz | |
Merge "Fix test_migrations on Python 3"
| -rw-r--r-- | oslo_db/sqlalchemy/test_migrations.py | 3 | ||||
| -rw-r--r-- | oslo_db/tests/sqlalchemy/test_migrations.py | 23 |
2 files changed, 16 insertions, 10 deletions
diff --git a/oslo_db/sqlalchemy/test_migrations.py b/oslo_db/sqlalchemy/test_migrations.py index 5204b85..627e563 100644 --- a/oslo_db/sqlalchemy/test_migrations.py +++ b/oslo_db/sqlalchemy/test_migrations.py @@ -185,7 +185,8 @@ class WalkVersionsMixin(object): self.REPOSITORY)) LOG.debug('latest version is %s', self.REPOSITORY.latest) - versions = range(self.INIT_VERSION + 1, self.REPOSITORY.latest + 1) + versions = range(int(self.INIT_VERSION) + 1, + int(self.REPOSITORY.latest) + 1) for version in versions: # upgrade -> downgrade -> upgrade diff --git a/oslo_db/tests/sqlalchemy/test_migrations.py b/oslo_db/tests/sqlalchemy/test_migrations.py index 3f37502..3df4021 100644 --- a/oslo_db/tests/sqlalchemy/test_migrations.py +++ b/oslo_db/tests/sqlalchemy/test_migrations.py @@ -15,6 +15,7 @@ # under the License. import fixtures +from migrate.versioning import api as versioning_api import mock from oslotest import base as test import six @@ -30,7 +31,7 @@ class TestWalkVersions(test.BaseTestCase, migrate.WalkVersionsMixin): migration_api = mock.MagicMock() REPOSITORY = mock.MagicMock() engine = mock.MagicMock() - INIT_VERSION = 4 + INIT_VERSION = versioning_api.VerNum(4) @property def migrate_engine(self): @@ -96,7 +97,7 @@ class TestWalkVersions(test.BaseTestCase, migrate.WalkVersionsMixin): @mock.patch.object(migrate.WalkVersionsMixin, 'migrate_up') @mock.patch.object(migrate.WalkVersionsMixin, 'migrate_down') def test_walk_versions_all_default(self, migrate_up, migrate_down): - self.REPOSITORY.latest = 20 + self.REPOSITORY.latest = versioning_api.VerNum(20) self.migration_api.db_version.return_value = self.INIT_VERSION self.walk_versions() @@ -106,7 +107,8 @@ class TestWalkVersions(test.BaseTestCase, migrate.WalkVersionsMixin): self.migration_api.db_version.assert_called_with( self.engine, self.REPOSITORY) - versions = range(self.INIT_VERSION + 1, self.REPOSITORY.latest + 1) + versions = range(int(self.INIT_VERSION) + 1, + int(self.REPOSITORY.latest) + 1) upgraded = [mock.call(v, with_data=True) for v in versions] self.assertEqual(self.migrate_up.call_args_list, upgraded) @@ -117,12 +119,13 @@ class TestWalkVersions(test.BaseTestCase, migrate.WalkVersionsMixin): @mock.patch.object(migrate.WalkVersionsMixin, 'migrate_up') @mock.patch.object(migrate.WalkVersionsMixin, 'migrate_down') def test_walk_versions_all_true(self, migrate_up, migrate_down): - self.REPOSITORY.latest = 20 + self.REPOSITORY.latest = versioning_api.VerNum(20) self.migration_api.db_version.return_value = self.INIT_VERSION self.walk_versions(snake_walk=True, downgrade=True) - versions = range(self.INIT_VERSION + 1, self.REPOSITORY.latest + 1) + versions = range(int(self.INIT_VERSION) + 1, + int(self.REPOSITORY.latest) + 1) upgraded = [] for v in versions: upgraded.append(mock.call(v, with_data=True)) @@ -141,12 +144,13 @@ class TestWalkVersions(test.BaseTestCase, migrate.WalkVersionsMixin): @mock.patch.object(migrate.WalkVersionsMixin, 'migrate_up') @mock.patch.object(migrate.WalkVersionsMixin, 'migrate_down') def test_walk_versions_true_false(self, migrate_up, migrate_down): - self.REPOSITORY.latest = 20 + self.REPOSITORY.latest = versioning_api.VerNum(20) self.migration_api.db_version.return_value = self.INIT_VERSION self.walk_versions(snake_walk=True, downgrade=False) - versions = range(self.INIT_VERSION + 1, self.REPOSITORY.latest + 1) + versions = range(int(self.INIT_VERSION) + 1, + int(self.REPOSITORY.latest) + 1) upgraded = [] for v in versions: @@ -160,12 +164,13 @@ class TestWalkVersions(test.BaseTestCase, migrate.WalkVersionsMixin): @mock.patch.object(migrate.WalkVersionsMixin, 'migrate_up') @mock.patch.object(migrate.WalkVersionsMixin, 'migrate_down') def test_walk_versions_all_false(self, migrate_up, migrate_down): - self.REPOSITORY.latest = 20 + self.REPOSITORY.latest = versioning_api.VerNum(20) self.migration_api.db_version.return_value = self.INIT_VERSION self.walk_versions(snake_walk=False, downgrade=False) - versions = range(self.INIT_VERSION + 1, self.REPOSITORY.latest + 1) + versions = range(int(self.INIT_VERSION) + 1, + int(self.REPOSITORY.latest) + 1) upgraded = [mock.call(v, with_data=True) for v in versions] self.assertEqual(upgraded, self.migrate_up.call_args_list) |