- merge attribute flag overhaul for [ticket:2358]

3 files changed, 24 insertions, 13 deletions

diff --git a/test/base/test_utils.py b/test/base/test_utils.py
index 3a7ce07f2..b65124c38 100644
--- a/test/base/test_utils.py
+++ b/test/base/test_utils.py
@@ -616,6 +616,27 @@ class SymbolTest(fixtures.TestBase):
             assert rt is sym1
             assert rt is sym2
 
+    def test_bitflags(self):
+        sym1 = util.symbol('sym1', canonical=1)
+        sym2 = util.symbol('sym2', canonical=2)
+
+        assert sym1 & sym1
+        assert not sym1 & sym2
+        assert not sym1 & sym1 & sym2
+
+    def test_composites(self):
+        sym1 = util.symbol('sym1', canonical=1)
+        sym2 = util.symbol('sym2', canonical=2)
+        sym3 = util.symbol('sym3', canonical=4)
+        sym4 = util.symbol('sym4', canonical=8)
+
+        assert sym1 & (sym2 | sym1 | sym4)
+        assert not sym1 & (sym2 | sym3)
+
+        assert not (sym1 | sym2) & (sym3 | sym4)
+        assert (sym1 | sym2) & (sym2 | sym4)
+
+
 class WeakIdentityMappingTest(fixtures.TestBase):
     class Data(object):
         pass
diff --git a/test/orm/inheritance/test_basic.py b/test/orm/inheritance/test_basic.py
index 3785fcdaa..271dd4959 100644
--- a/test/orm/inheritance/test_basic.py
+++ b/test/orm/inheritance/test_basic.py
@@ -68,11 +68,9 @@ class O2MTest(fixtures.MappedTest):
         l = sess.query(Blub).all()
         result = ','.join([repr(l[0]), repr(l[1]),
                           repr(l[0].parent_foo), repr(l[1].parent_foo)])
-        print compare
-        print result
-        self.assert_(compare == result)
-        self.assert_(l[0].parent_foo.data == 'foo #1'
-                     and l[1].parent_foo.data == 'foo #1')
+        eq_(compare, result)
+        eq_(l[0].parent_foo.data, 'foo #1')
+        eq_(l[1].parent_foo.data, 'foo #1')
 
 class PolymorphicOnNotLocalTest(fixtures.MappedTest):
     @classmethod
diff --git a/test/orm/test_attributes.py b/test/orm/test_attributes.py
index e94afdb1b..7ff939a13 100644
--- a/test/orm/test_attributes.py
+++ b/test/orm/test_attributes.py
@@ -990,14 +990,6 @@ class GetNoValueTest(fixtures.ORMTest):
         )
         assert 'attr' not in dict_
 
-    def test_passive_no_result_empty(self):
-        attr, state, dict_ = self._fixture(None)
-        eq_(
-            attr.get(state, dict_, passive=attributes.PASSIVE_NO_RESULT),
-            None
-        )
-        assert 'attr' in dict_
-
     def test_off_empty(self):
         attr, state, dict_ = self._fixture(None)
         eq_(