diff options
| author | Sławek Ehlert <slafs@op.pl> | 2015-01-27 22:04:38 +0100 |
|---|---|---|
| committer | Sławek Ehlert <slafs@op.pl> | 2015-01-27 22:04:38 +0100 |
| commit | 57b2bd5dcba6140b511c898c0f682234f13d5c51 (patch) | |
| tree | a0899b2a35d27e177001b163054c3c9a8f7f1c06 /test/ext | |
| parent | 6a1f16d09958e549502a0991890d64964c71b357 (diff) | |
| parent | 8aaa8dd6bdfb85fa481efa3115b9080d935d344c (diff) | |
| download | sqlalchemy-pr/152.tar.gz | |
Merge branch 'master' into oracle-servicename-optionpr/152
Diffstat (limited to 'test/ext')
| -rw-r--r-- | test/ext/test_extendedattr.py | 2 | ||||
| -rw-r--r-- | test/ext/test_horizontal_shard.py | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/test/ext/test_extendedattr.py b/test/ext/test_extendedattr.py index 352b6b241..c7627c8b2 100644 --- a/test/ext/test_extendedattr.py +++ b/test/ext/test_extendedattr.py @@ -485,5 +485,5 @@ class ExtendedEventsTest(fixtures.ORMTest): register_class(A) manager = instrumentation.manager_of_class(A) - assert issubclass(manager.dispatch._parent_cls.__dict__['dispatch'].events, MyEvents) + assert issubclass(manager.dispatch._events, MyEvents) diff --git a/test/ext/test_horizontal_shard.py b/test/ext/test_horizontal_shard.py index 99879a74d..0af33ecde 100644 --- a/test/ext/test_horizontal_shard.py +++ b/test/ext/test_horizontal_shard.py @@ -235,8 +235,6 @@ class AttachedFileShardTest(ShardTest, fixtures.TestBase): def _init_dbs(self): db1 = testing_engine('sqlite://', options={"execution_options": {"shard_id": "shard1"}}) - assert db1._has_events - db2 = db1.execution_options(shard_id="shard2") db3 = db1.execution_options(shard_id="shard3") db4 = db1.execution_options(shard_id="shard4") |