3 files changed, 75 insertions, 0 deletions
diff --git a/tests/test_alchemy.py b/tests/test_alchemy.py
index 9d7288a..5d8f275 100644
--- a/tests/test_alchemy.py
+++ b/tests/test_alchemy.py
@@ -23,6 +23,7 @@
 
 import factory
 from .compat import unittest
+import mock
 
 
 try:
@@ -55,6 +56,16 @@ class StandardFactory(SQLAlchemyModelFactory):
     foo = factory.Sequence(lambda n: 'foo%d' % n)
 
 
+class ForceFlushingStandardFactory(SQLAlchemyModelFactory):
+    class Meta:
+        model = models.StandardModel
+        sqlalchemy_session = mock.MagicMock()
+        force_flush = True
+
+    id = factory.Sequence(lambda n: n)
+    foo = factory.Sequence(lambda n: 'foo%d' % n)
+
+
 class NonIntegerPkFactory(SQLAlchemyModelFactory):
     class Meta:
         model = models.NonIntegerPk
@@ -103,6 +114,27 @@ class SQLAlchemyPkSequenceTestCase(unittest.TestCase):
 
 
 @unittest.skipIf(sqlalchemy is None, "SQLalchemy not installed.")
+class SQLAlchemyForceFlushTestCase(unittest.TestCase):
+    def setUp(self):
+        super(SQLAlchemyForceFlushTestCase, self).setUp()
+        ForceFlushingStandardFactory.reset_sequence(1)
+        ForceFlushingStandardFactory._meta.sqlalchemy_session.rollback()
+        ForceFlushingStandardFactory._meta.sqlalchemy_session.reset_mock()
+
+    def test_force_flush_called(self):
+        self.assertFalse(ForceFlushingStandardFactory._meta.sqlalchemy_session.flush.called)
+        ForceFlushingStandardFactory.create()
+        self.assertTrue(ForceFlushingStandardFactory._meta.sqlalchemy_session.flush.called)
+
+    def test_force_flush_not_called(self):
+        ForceFlushingStandardFactory._meta.force_flush = False
+        self.assertFalse(ForceFlushingStandardFactory._meta.sqlalchemy_session.flush.called)
+        ForceFlushingStandardFactory.create()
+        self.assertFalse(ForceFlushingStandardFactory._meta.sqlalchemy_session.flush.called)
+        ForceFlushingStandardFactory._meta.force_flush = True
+
+
+@unittest.skipIf(sqlalchemy is None, "SQLalchemy not installed.")
 class SQLAlchemyNonIntegerPkTestCase(unittest.TestCase):
     def setUp(self):
         super(SQLAlchemyNonIntegerPkTestCase, self).setUp()
diff --git a/tests/test_fuzzy.py b/tests/test_fuzzy.py
index 3f9c434..4c3873a 100644
--- a/tests/test_fuzzy.py
+++ b/tests/test_fuzzy.py
@@ -189,6 +189,19 @@ class FuzzyDecimalTestCase(unittest.TestCase):
 
         self.assertEqual(decimal.Decimal('8.001').quantize(decimal.Decimal(10) ** -3), res)
 
+    @unittest.skipIf(compat.PY2, "decimal.FloatOperation was added in Py3")
+    def test_no_approximation(self):
+        """We should not go through floats in our fuzzy calls unless actually needed."""
+        fuzz = fuzzy.FuzzyDecimal(0, 10)
+
+        decimal_context = decimal.getcontext()
+        old_traps = decimal_context.traps[decimal.FloatOperation]
+        try:
+            decimal_context.traps[decimal.FloatOperation] = True
+            fuzz.evaluate(2, None, None)
+        finally:
+            decimal_context.traps[decimal.FloatOperation] = old_traps
+
 
 class FuzzyDateTestCase(unittest.TestCase):
     @classmethod
diff --git a/tests/test_using.py b/tests/test_using.py
index c7d2b85..0a893c1 100644
--- a/tests/test_using.py
+++ b/tests/test_using.py
@@ -1924,6 +1924,36 @@ class PostGenerationTestCase(unittest.TestCase):
         self.assertEqual(3, related.one)
         self.assertEqual(4, related.two)
 
+    def test_related_factory_selfattribute(self):
+        class TestRelatedObject(object):
+            def __init__(self, obj=None, one=None, two=None):
+                obj.related = self
+                self.one = one
+                self.two = two
+                self.three = obj
+
+        class TestRelatedObjectFactory(factory.Factory):
+            class Meta:
+                model = TestRelatedObject
+            one = 1
+            two = factory.LazyAttribute(lambda o: o.one + 1)
+
+        class TestObjectFactory(factory.Factory):
+            class Meta:
+                model = TestObject
+            one = 3
+            two = 2
+            three = factory.RelatedFactory(TestRelatedObjectFactory, 'obj',
+                two=factory.SelfAttribute('obj.two'),
+            )
+
+        obj = TestObjectFactory.build(two=4)
+        self.assertEqual(3, obj.one)
+        self.assertEqual(4, obj.two)
+        self.assertEqual(1, obj.related.one)
+        self.assertEqual(4, obj.related.two)
+
+
 
 class RelatedFactoryExtractionTestCase(unittest.TestCase):
     def setUp(self):