diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2007-07-27 04:08:53 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2007-07-27 04:08:53 +0000 |
| commit | ed4fc64bb0ac61c27bc4af32962fb129e74a36bf (patch) | |
| tree | c1cf2fb7b1cafced82a8898e23d2a0bf5ced8526 /test/orm/alltests.py | |
| parent | 3a8e235af64e36b3b711df1f069d32359fe6c967 (diff) | |
| download | sqlalchemy-ed4fc64bb0ac61c27bc4af32962fb129e74a36bf.tar.gz | |
merging 0.4 branch to trunk. see CHANGES for details. 0.3 moves to maintenance branch in branches/rel_0_3.
Diffstat (limited to 'test/orm/alltests.py')
| -rw-r--r-- | test/orm/alltests.py | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/test/orm/alltests.py b/test/orm/alltests.py index 35650c136..4f8f4b6b7 100644 --- a/test/orm/alltests.py +++ b/test/orm/alltests.py @@ -1,18 +1,20 @@ import testbase import unittest +import inheritance.alltests as inheritance +import sharding.alltests as sharding + def suite(): modules_to_test = ( - 'orm.attributes', - 'orm.mapper', + 'orm.attributes', 'orm.query', 'orm.lazy_relations', 'orm.eager_relations', + 'orm.mapper', + 'orm.collection', 'orm.generative', 'orm.lazytest1', - 'orm.eagertest1', - 'orm.eagertest2', - 'orm.eagertest3', + 'orm.assorted_eager', 'orm.sessioncontext', 'orm.unitofwork', @@ -24,20 +26,11 @@ def suite(): 'orm.memusage', 'orm.cycles', - 'orm.poly_linked_list', 'orm.entity', 'orm.compile', 'orm.manytomany', 'orm.onetoone', - 'orm.inheritance', - 'orm.inheritance2', - 'orm.inheritance3', - 'orm.inheritance4', - 'orm.inheritance5', - 'orm.abc_inheritance', - 'orm.single', - 'orm.polymorph' ) alltests = unittest.TestSuite() for name in modules_to_test: @@ -45,6 +38,8 @@ def suite(): for token in name.split('.')[1:]: mod = getattr(mod, token) alltests.addTest(unittest.findTestCases(mod, suiteClass=None)) + alltests.addTest(inheritance.suite()) + alltests.addTest(sharding.suite()) return alltests |