diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2012-07-18 16:43:02 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2012-07-18 16:43:02 -0400 |
| commit | 9c0de7fcf7fc56701af446742fe876335aef15b1 (patch) | |
| tree | 5fb52bc62b39c9ac9c9f87285443d02d6d39678a /test/orm/test_sync.py | |
| parent | dff7c2ad2c913ed0ec5979ff9470dd5dd5813483 (diff) | |
| download | sqlalchemy-9c0de7fcf7fc56701af446742fe876335aef15b1.tar.gz | |
- with InstanceState more public, underscore all its methods
that change object state as these aren't intended for public
use.
Diffstat (limited to 'test/orm/test_sync.py')
| -rw-r--r-- | test/orm/test_sync.py | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/test/orm/test_sync.py b/test/orm/test_sync.py index 178d396b9..9134e47ce 100644 --- a/test/orm/test_sync.py +++ b/test/orm/test_sync.py @@ -21,7 +21,7 @@ class AssertsUOW(object): uow.register_object(d, isdelete=True) return uow -class SyncTest(fixtures.MappedTest, +class SyncTest(fixtures.MappedTest, testing.AssertsExecutionResults, AssertsUOW): @classmethod @@ -89,11 +89,11 @@ class SyncTest(fixtures.MappedTest, "Can't execute sync rule for source column 't2.id'; " r"mapper 'Mapper\|A\|t1' does not map this column.", sync.populate, - a1, - a_mapper, - b1, - b_mapper, - pairs, + a1, + a_mapper, + b1, + b_mapper, + pairs, uowcommit, False ) @@ -105,11 +105,11 @@ class SyncTest(fixtures.MappedTest, "Can't execute sync rule for destination " r"column 't1.id'; mapper 'Mapper\|B\|t2' does not map this column.", sync.populate, - a1, - a_mapper, - b1, - b_mapper, - pairs, + a1, + a_mapper, + b1, + b_mapper, + pairs, uowcommit, False ) @@ -147,7 +147,7 @@ class SyncTest(fixtures.MappedTest, def test_update(self): uowcommit, a1, b1, a_mapper, b_mapper = self._fixture() a1.obj().id = 10 - a1.commit_all(a1.dict) + a1._commit_all(a1.dict) a1.obj().id = 12 pairs = [(a_mapper.c.id, b_mapper.c.id,)] dest = {} @@ -190,25 +190,25 @@ class SyncTest(fixtures.MappedTest, a1.obj().id = 10 pairs = [(a_mapper.c.id, b_mapper.c.id,)] eq_( - sync.source_modified(uowcommit, a1, a_mapper, pairs), + sync.source_modified(uowcommit, a1, a_mapper, pairs), False ) def test_source_modified_no_pairs(self): uowcommit, a1, b1, a_mapper, b_mapper = self._fixture() eq_( - sync.source_modified(uowcommit, a1, a_mapper, []), + sync.source_modified(uowcommit, a1, a_mapper, []), False ) def test_source_modified_modified(self): uowcommit, a1, b1, a_mapper, b_mapper = self._fixture() a1.obj().id = 10 - a1.commit_all(a1.dict) + a1._commit_all(a1.dict) a1.obj().id = 12 pairs = [(a_mapper.c.id, b_mapper.c.id,)] eq_( - sync.source_modified(uowcommit, a1, a_mapper, pairs), + sync.source_modified(uowcommit, a1, a_mapper, pairs), True ) |