From 383c3fede503baaf6342b08d4e168bb96befcd6f Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Sun, 3 Mar 2013 19:22:43 -0500 Subject: [PATCH] - this assertion moves out to configure_mappers() now --- test/orm/test_unitofwork.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/test/orm/test_unitofwork.py b/test/orm/test_unitofwork.py index 7fc728f1de..6be1672e16 100644 --- a/test/orm/test_unitofwork.py +++ b/test/orm/test_unitofwork.py @@ -616,19 +616,25 @@ class ExtraPassiveDeletesTest(fixtures.MappedTest): def test_assertions(self): myothertable, MyOtherClass = self.tables.myothertable, self.classes.MyOtherClass + mytable, MyClass = self.tables.mytable, self.classes.MyClass + mapper(MyClass, mytable, properties={ + 'foo': relationship(MyOtherClass, + passive_deletes='all', + cascade="all") + }) mapper(MyOtherClass, myothertable) + assert_raises_message( sa.exc.ArgumentError, - "Can't set passive_deletes='all' in conjunction with 'delete' " + "On MyClass.foo, can't set passive_deletes='all' in conjunction with 'delete' " "or 'delete-orphan' cascade", - relationship, MyOtherClass, - passive_deletes='all', - cascade="all" + sa.orm.configure_mappers ) def test_extra_passive(self): - myothertable, MyClass, MyOtherClass, mytable = (self.tables.myothertable, + myothertable, MyClass, MyOtherClass, mytable = ( + self.tables.myothertable, self.classes.MyClass, self.classes.MyOtherClass, self.tables.mytable) -- 2.47.2