diff options
| -rw-r--r-- | tests/sqlalchemy/test_migrations.py | 7 | ||||
| -rw-r--r-- | tests/sqlalchemy/test_models.py | 31 |
2 files changed, 17 insertions, 21 deletions
diff --git a/tests/sqlalchemy/test_migrations.py b/tests/sqlalchemy/test_migrations.py index db6c9c8..1c560e8 100644 --- a/tests/sqlalchemy/test_migrations.py +++ b/tests/sqlalchemy/test_migrations.py @@ -240,7 +240,10 @@ class ModelsMigrationSyncMixin(test.BaseTestCase): self.metadata_migrations.create_all(bind=engine) def include_object(self, object_, name, type_, reflected, compare_to): - return type_ == 'table' and name == 'testtbl' or type_ == 'column' + if type_ == 'table': + return name == 'testtbl' + else: + return True def _test_models_not_sync(self): self.metadata_migrations.clear() @@ -281,7 +284,7 @@ class ModelsMigrationSyncMixin(test.BaseTestCase): 'Models and migration scripts aren\'t in sync:')) self.assertIn('testtbl', msg) self.assertIn('spam', msg) - self.assertIn('eggs', msg) + self.assertIn('eggs', msg) # test that the unique constraint is added self.assertIn('foo', msg) self.assertIn('bar', msg) self.assertIn('bool_wo_default', msg) diff --git a/tests/sqlalchemy/test_models.py b/tests/sqlalchemy/test_models.py index 257bf5c..5ac159a 100644 --- a/tests/sqlalchemy/test_models.py +++ b/tests/sqlalchemy/test_models.py @@ -13,6 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. +import collections + from oslotest import base as oslo_test from sqlalchemy import Column from sqlalchemy import Integer, String @@ -35,14 +37,16 @@ class ModelBaseTest(test_base.DbTestCase): dict_methods = ('__getitem__', '__setitem__', '__contains__', - '__iter__', 'get', - 'next', 'update', 'save', 'iteritems') for method in dict_methods: - self.assertTrue(hasattr(models.ModelBase, method)) + self.assertTrue(hasattr(models.ModelBase, method), + "Method %s() is not found" % method) + + def test_modelbase_is_iterable(self): + self.assertTrue(issubclass(models.ModelBase, collections.Iterable)) def test_modelbase_set(self): self.mb['world'] = 'hello' @@ -135,19 +139,8 @@ class ExtraKeysModel(BASE, models.ModelBase): class TimestampMixinTest(oslo_test.BaseTestCase): def test_timestampmixin_attr(self): - - class TestModel(models.ModelBase, models.TimestampMixin): - pass - - dict_methods = ('__getitem__', - '__setitem__', - '__iter__', - 'get', - 'next', - 'update', - 'save', - 'iteritems', - 'created_at', - 'updated_at') - for method in dict_methods: - self.assertTrue(hasattr(TestModel, method)) + methods = ('created_at', + 'updated_at') + for method in methods: + self.assertTrue(hasattr(models.TimestampMixin, method), + "Method %s() is not found" % method) |