diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-11-28 12:16:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-11-28 12:16:42 +0000 |
| commit | 29e229a0539b730f30e2962930cb73008224451c (patch) | |
| tree | e378aa0eb93eab5cf6ee1d373922ba31d0596a6d | |
| parent | 3d5a9b134f907bc2c4ee65d6d0375927117c2e34 (diff) | |
| parent | ca1ad565797fefaf2e63efab6582e9f3c04b7f80 (diff) | |
| download | oslo-db-29e229a0539b730f30e2962930cb73008224451c.tar.gz | |
Merge "Make test_models pass on py3"
| -rw-r--r-- | tests/sqlalchemy/test_models.py | 31 |
1 files changed, 12 insertions, 19 deletions
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) |